Fix #277
Merge branch 'master' of git://github.com/biocore/emperor into issue_277

Conflicts:
	ChangeLog.md
fixing change log
Merge pull request #295 from antgonza/issue_277

Fix #277