a few more trailing space removals, //ids removals, tabs
Merge pull request #872 from eileenmcnaughton/master

a bit more formatting / whitespace