Fix merge bug
Merge branch 'adapt_tto' into development
fix merge typo
Fix merge bug part two
Merge pull request #9 from jayme-github/adapt_tto

Adapt transaction, trade and order objects.
Merge branch 'master' into development

Conflicts:
	cryptex/exchange/btce.py
add limit to get_my_trades
would be good to know the content when it could not be parsed
db9b40a accidentally removed the self.trade_id assignment
Merge branch 'readd_trade_id' into development
Merge pull request #11 from jayme-github/readd_trade_id

db9b40a accidentally removed the self.trade_id assignment
Fix syntax error in Cryptsy exchange
add simple fee cache
fix_json_types does not make an exceptoin for trade_id
Readme formatting
Add missing package to setup
Remove order_type set from Order constructor
Merge branch 'master' into development

Conflicts:
	cryptex/exchange/cryptsy.py
Removed all references to fix_json_types in Crytpy

Conflicts:
	cryptex/exchange/cryptsy.py
Reformatting of Cryptsy Trade and Order types with decimals

Conflicts:
	cryptex/exchange/cryptsy.py