Merge pull request #5 from elliottcarlson/master

Add ~btc command
Merge pull request #2 from huntwelch/master

Update from master