Merge pull request #485 from teharrison/develop

fix biom format
Adding updated Metadata template
Merge pull request #486 from jaredbischof/develop

Adding updated Metadata template
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
add alias to solr dump