Merge pull request #572 from teharrison/shock

now submit to awe in upload
Merge pull request #577 from teharrison/shock

upload page, fix bowtie index and filepath
fix using wrong id in lookup
Merge branch 'shock' of github.com:teharrison/MG-RAST into shock
Merge branch 'shock' of github.com:MG-RAST/MG-RAST into shock