pre lunch projgress
getting ready for Yoshiki
Merge branch 'ebi-tests-round2' of git://github.com/teravest/qiita into ebi-tests-round2
TST: Add tests for EBISubmission.__init__
latest progress
Merge branch 'ebi-tests-round2' of https://github.com/teravest/qiita into ebi-tests-round2

Conflicts:
	qiita_db/test/test_metadata_template.py
TST/BUG: Fix kwrg stringify and add tests
finished test_add_samples_from_templates
Merge branch 'ebi-tests-round2' of github.com:teravest/qiita into ebi-tests-round2
add write_xml tests
Merge branch 'ebi-tests-round2' of github.com:teravest/qiita into ebi-tests-round2
TST: Add tests _get{experiment,sample,study}_alias
Merge branch 'master' of git://github.com/biocore/qiita into ebi-tests-round2
Merge branch 'ebi-issue-314' of git://github.com/adamrp/qiita into ebi-tests-round2
Merge pull request #3 from teravest/ebi-tests-round2

pre lunch progress