Fixed logging
Using example from Heroku guidelines instead
Commiting forgotten files