Revert "Merge pull request #160 from jonls/main-c++"

This reverts commit a4a614fa8c4bc243aaebb6b1c49417a327a78b11, reversing
changes made to 4f92746b8120615a18cc7e7620982b0e7fd23dc9.

Conflicts:
	src/freeserf.cc

revert commit