Merge branch 'master' of https://github.com/ianchildress/coinswap-arbitrage

Conflicts:
	coinswap.go
added cryptsy.go
Some minor touchups
Merge branch 'master' of https://github.com/defcronyke/coinswap-arbitrage

Conflicts:
	coinswap.go