Less verbose output
Add conda install instructions
Merge branch 'master' into dev