Merge pull request #505 from kyleabeauchamp/master

[WIP] Testing fix to conda install command on doc notebook