Merge branch 'production'
Add newline to end of file
Delete Watson todo.txt file in favour of github issues
Update requirements and ingore virtualenv
Fix WSGI file, ignore more venv, commit config
Merge branch 'master' into staging