Merge pull request #283 from MG-RAST/develop

Merging changes from develop to master for hotfix
Merge pull request #310 from paczian/master

fixed uploader handling of partial files with sanitized filenames
analysis page fixes: stop warning spam in web log, fix BIOM ontology export, fix ids to be real (func group id or ncbi tax id)
Merge branch 'develop' of git@github.com:MG-RAST/MG-RAST into develop
Merge pull request #311 from teharrison/develop

analysis page: stop warning spam in web log, fix BIOM ontology export, fix BIOM ids to be real (func group id or ncbi tax id)
Merge pull request #312 from MG-RAST/develop

3.3.4 release
Removing html code from user registration inputs.
Typo.
Retrieving CGI var.
Typo.
Merge pull request #313 from jaredbischof/develop

Removing html code from user registration inputs.
Merge pull request #314 from MG-RAST/master

Removing html code from user registration inputs.