Add mbtc, fix conversions
Merge branch 'master' of github.com:zenchilabs/bitcoin-money