Merge branch 'master' of git://github.com/biocore/qiime into extra-help

Conflicts:
	setup.py