jobs now run
fix demo env biom table moving
fix run issues with analysis status
websockets waiting working
Merge branch 'master' of github.com:biocore/qiita into integrate-web
fix analysis tests
fix folders not showing index.html
Merge branch 'master' of github.com:biocore/qiita into integrate-web
fix folder index.html
Merge pull request #165 from squirrelo/integrate-web

Integrate web
Solve merge conflict