Undo changes not part of c++11 change.
Merge pull request #11 from scottpurdy/c++11-clean-history

Undo changes not part of c++11 change.