General cleanup

Sorry I didn't break this into smaller branches, but I kind of had a wine buzz going.
This pull request:
* Removes the git merge junk that kept gitcoach from running
* Fixes a few variable names that raised runtime errors
* Swapped out the Makefile for a setup.py file (can submit to PyPI, build tarballs, etc. Everything the Makefile did, but better).
* Removes the d, e, and f files, which were empty
* Ran the scripts through autopep8, and now they look all pretty.

This isn't quite complete, because I had no idea what license you wanted to use. After that, we can submit it to PyPI, and fame and glory will rain down from the heavens upon you and this project. Or it'll at least get a bit more traction.