Pulling in 	bitfinex support from antonivs's repo

This merge is to reconcile my fork to more closely follow the current state of askmike's repo.