added ability to change color choice - fixes #258
Merge branch 'master' of github.com:qiime/qiime into issue-258

Conflicts:
	qiime/make_otu_heatmap.py
	scripts/make_otu_heatmap.py
pep8'ing
added myself to credits, noted in changelog
Merge pull request #1386 from gregcaporaso/issue-258

fixes issue 258