Merge pull request #1 from huntwelch/master

Merge from upstream
Update cortex.py

Add ~btc command to retrieve bitcoin market values
Merge pull request #5 from elliottcarlson/master

Add ~btc command