Better Formatting and Separating Local and Heroku Development

And other small changes