Merge pull request #235 from MG-RAST/develop

Updating master with develop
Merge pull request #240 from paczian/master

kbase login upgrade
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
Merge branch 'develop' of git@github.com:MG-RAST/MG-RAST into develop
added new options
fixed bug with bad alpha-diversity number
updated matrix info
updated abundanceprofile info
this is depricated, async added to matrix.pm
Merge pull request #247 from teharrison/develop

minor fixes
Merge pull request #248 from paczian/master

api documentation update + m5nr fix
Merge branch 'master' of git@github.com:MG-RAST/MG-RAST into develop
add sequence type to migs metagenome output
Merge pull request #250 from teharrison/develop

add sequence type to migs metagenome output
exchanged init for get objects, init only works if there is an index on all params