Merged mlmurray's cryptsy repo into mine. No fork as I already changed some files