BUG: Fix bug in make_otu_heatmap

The order of the sample ids was being respected by make_otu_heatmap.py and
regardless of what options were used, the sample labels remained the same.

@adamrp, @jairideout if you guys can review this, that would be amazing.        

Fixes #1790