remove a bunch of cruft
Merge pull request #490 from justinstoller/maint/master/remove_cruft

Remove a lot of the cruft left in the source tree.