Bump conda version
Merge pull request #86 from stephentu/master

Bump conda version