deleting unused files
adding ipython to setup.py
Merge branch 'jobtweaks', remote-tracking branch 'origin' into moreweb
add jobs to analysis, create wait page
waiting page with websockeets added
merge upstream/master
Merge branch 'master' of github.com:biocore/qiita into moreweb
add results page
save before merge
merged
add results page
merge upstream/master
Merge branch 'moreweb' of github.com:squirrelo/qiita into moreweb
Merge branch 'master' of git://github.com/biocore/qiita into launch_job
MAINT/STY: Remove print statements and indent HTML
Merge branch 'master' of github.com:biocore/qiita into moreweb
waiting on other pull requests
Merge branch 'master' of github.com:biocore/qiita into moreweb
coverage testing using nosetests
Merge branch 'master' of github.com:biocore/qiita into moreweb