trying to fix travis
commenting out the update conda
Putting the update line back on
Fixing merge conflicts
Adding more tests and fixing the existing ones for metadata summary handler
fixing small bug on using the defaultdict
Merge pull request #711 from josenavas/refactor-study-description

Refactor study description
Merge branch 'master' of https://github.com/biocore/qiita into vamps-button