random stuff
Merge remote-tracking branch 'mothur/master'