Fix whitespace
port box2d cleanups from c++11 branch to master
minor formatting to sync cleaner with master
merge with master