documentation_fix
documentation_fix
fixed order of operations...
comment update
changed MinimalFastaParser to fasta_parse.
removed make_distance_histograms from QIIME.
Added new line character at end of qiime.colors
removed unused imports of SeparatorFormatParser
Merge branch 'master' of github.com:qiime/qiime into change_fasta_parse

Conflicts:
	qiime/align_seqs.py
	qiime/validate_demultiplexed_fasta.py
	tests/test_format.py
changed fasta_parse to parse_fasta
Merge pull request #1455 from johnchase/change_SeparatorFormatParser

removed unused imports of SeparatorFormatParser
Merge pull request #1453 from johnchase/change_fasta_parse

changed MinimalFastaParser to fasta_parse.
fixed bad imports
removed test data directory
Merge pull request #1454 from johnchase/remove_make_dis_hist

Remove make dis hist
Merge pull request #1443 from heatyen/documentation_fix

Documentation fix
Merge branch 'master' of github.com:qiime/qiime into filter_alignment_issue

Conflicts:
	qiime/filter_alignment.py
Merge pull request #1446 from wasade/filter_alignment_issue

Addressed a filtering issue introduced between QIIME 1.7 and 1.8