Testing merge with master

This is the last functional version of the Testing branch before moving to the dev branch of Qiime.