Clean up warnings and some normalization against trunk. Tested: McaOSX/64 10.10.5 (amazon) w/serial & parallel (h5committest not required on this branch)