Added gunicorn to reqs
Fixed silly merge conflict - pushed from live like idiot.