Fixing issue 117
Merge pull request #118 from antgonza/issue_117

Fixing issue 117
Merge branch 'master' of github.com:qiime/emperor