Merge pull request #476 from jaredbischof/develop

More explicit labeling of what join paired-ends operation does
restore abundance profile in new dir struct
api: added mixs compilent flag to mg object
Merge branch 'master' of git@github.com:teharrison/MG-RAST into develop
Merge pull request #477 from teharrison/develop

Develop
restore abundance profile - fix bug
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
updated to work with mg-rast or kbase auth
Merge pull request #478 from paczian/master

updated to work with mg-rast or kbase auth
fixed auth bugs
Merge pull request #479 from paczian/master

fixed auth bugs