Merge branch 'master' of git://github.com/biocore/qiime into issue-1627

Conflicts:
	ChangeLog.md