actually uses api now
Merge branch 'master' of https://github.com/oskanberg/btc-invest

Conflicts:
	bitstamp_api_test.py