Make changes so github matches what is deployed to the server

I can't believe I had to do this...
Merge pull request #25 from rcos/server_hack_fixes

Make changes so github matches what is deployed to the server