Heroku

Last two changes made to prep master for heroku