add lock and status stuff
Merge pull request #145 from squirrelo/job-status-thing-fix

Adding in required status funcs and locks
Merge branch 'master' of github.com:biocore/qiita into moreweb
fix .travis.yml
Merge branch 'moreweb' of github.com:squirrelo/qiita into moreweb
comment out most of websocket_handler
[skip ci]