Cleaned up the conda.html file
Merge remote-tracking branch 'upstream/master'
Fixed a typo
Cleaned up conda.html
Cleaned up conda.html
Merge pull request #43 from Trentonoliphant/master

Cleaning up conda.html