Merge branch 'master' of github.com:MG-RAST/MG-RAST
Merge pull request #4 from teharrison/develop

missed merges
api: added mixs compilent flag to mg object
Merge branch 'master' of git@github.com:teharrison/MG-RAST into develop