Fix #302
addressing local comments
Merge pull request #305 from antgonza/issue_302

Fix #302
Merge branch 'master' of github.com:biocore/qiita into issue_274
Fix test inserts