Bit of config cleanup and start of heroku deploy