Pull server into its own file again and reenabled Heroku support.