Get most test passing

These changes get most of the existing tests passing. I also fixed a couple of config things which should make it easier for others to get the project up and running. I had to guess what was still relevant in a couple cases so please look at the changes to /config, Gemfile, and /app carefully. 

There are a fair number of whitespace changes. If they bug you let me know and I won't commit those kind of changes in the future. If you don't care you can append ?w=1 to the pull request url and github won't show you the whitespace changes.