Tabs -> Spaces
Added !bitstamp
Fix merge conflict