Committing so i can merge the update
Merge branch 'master' of github.com:biocore/scikit-bio into heatmap