Mike Frysinger - 2014-08-13

simple fixes attached -- i think it best to just delete the tests

details in each patch header