merged
Merge branch 'develop' of github.com:MG-RAST/MG-RAST
Now sanitizing filenames on upload before the files are written to disk.  Created subroutine so that filenames created from uploading and from extracting an archive have their filenames sanitized by one piece of code.
Fix for caching API queries.  Subroutine was not handling CGI parameter arrays correctly.
Merge pull request #252 from jaredbischof/develop

Sanitizing uploaded filenames and fix to caching API queries.
Merge pull request #253 from teharrison/develop

updated api metagenome, migs data consistant with overview page, 'full' ...
Merge branch 'develop' of github.com:MG-RAST/MG-RAST
added for pcoa calculations
Merge pull request #254 from paczian/master

added pcoa resource
Added user login to all memcache keys so resources like "metagenome" that are dependent on which user is doing the querying, can be cached.
Merge branch 'develop' of https://github.com/MG-RAST/MG-RAST into develop
Merge pull request #255 from jaredbischof/develop

Added user login to memcache key
Changed the sequenceset resource call to use get_objects instead of init to avoid PPO error "ERROR: resource request failed. There must be a unique index on the combination of attributes passed. at /mcs/bio/mg-rast/api/sites/MG-RAST/site/lib/PPO/DBObject.pm line 429."
Merge branch 'develop' of https://github.com/MG-RAST/MG-RAST into develop
Merge pull request #256 from jaredbischof/develop

Fix for sequenceset resource.
fix syntax error
Merge branch 'develop' of git@github.com:MG-RAST/MG-RAST into develop