Remove unused imports
Remove cast to Dict2D in mapping_file_to_dict
Remove useless import
Remove useless import
documentation_fix
documentation_fix
Changing cogent.core.alignment.eps by np.finfo(float).eps
fixed order of operations...
comment update
Temporarly storing to pull from upstream
Merged master version and fixed all issues
Removing last get_random_directory_name from imports
Remove Dict2D in make_compatible_distance_matrices

We are now using pure python to filter out the data from the distance
matrices.
Merge branch 'master' of git://github.com/qiime/qiime into torpedo-dict2d

Conflicts:
	tests/test_otu_significance.py
Merge branch 'torpedo-dict2d' of github.com:ElDeveloper/qiime into torpedo-dict2d
Remove unused import
Use numpy's advanced indexing

Thanks @ElBrogrammer!
fixing import error
Merge branch 'master' of https://github.com/qiime/qiime into mkdtemp
Merge branch 'master' of git://github.com/qiime/qiime into torpedo-dict2d

Conflicts:
	qiime/util.py