fix a lot of indentation and style problems in c++ code
more indentation and style fixes
Merge pull request #46 from js850/fix_style

Fix c++ indentation and style