sensible logging, more production settings
Merge branch 'master' into dev