Fix messed up dict key.
Mergeing with dev.
Merge branch 'dev'
Adding gunicorn.