Merge branch 'master' of https://github.com/jjbskir/BitcoinArbitrage

Conflicts:
	exchanges/__pycache__/Bitstamp.cpython-33.pyc
	tests/test_exchanges/__pycache__/TestAbstractExchange.cpython-33.pyc