Merge pull request #263 from MG-RAST/develop

Version 3.3.2 update
added source name to memcache key for 'representative hit'
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
Merge pull request #264 from teharrison/develop

added source name to memcache key for 'representative hit'
Merge pull request #265 from MG-RAST/master

Hot fix 3.3.2.1
Added user resource to new API.
Merge pull request #266 from jaredbischof/develop

Added user resource to new API.
added support for 'represtative hit' and 'lca hit' in organism matrix
Merge branch 'develop' of git@github.com:MG-RAST/MG-RAST into develop
Fixing some spacing and text and other minor stuff.
Added inbox resource to new API.
Merge branch 'develop' of https://github.com/MG-RAST/MG-RAST into develop
Merge pull request #268 from jaredbischof/develop

Added inbox resource to new API.
Merge pull request #267 from teharrison/develop

added support for 'represtative hit' and 'lca hit' in organism matrix
fixed missing output attribute
Merge pull request #269 from teharrison/develop

fixed missing output attribute