Merge pull request #349 from teharrison/master

fix qiime export
initial version of oauth2 with shock suppport
minor fixes
Merge branch 'develop' of github.com:MG-RAST/MG-RAST
Merge branch 'master' of github.com:MG-RAST/MG-RAST
added option to turn off recaptcha
added Register2 so the registration page can be checked by a bot
Merge pull request #355 from paczian/master

added oauth2, added register2
Merge branch 'develop' of git@github.com:MG-RAST/MG-RAST into develop