CPP: C++11 and frugal with whitespace / clean up code.
Merge pull request #17 from danielhams/master

CPP: C++11 and frugal with whitespace / clean up code.