Merge pull request #351 from whitslack/develop

correct scaling routines in CoinfloorUtils
fix TestCoinfloorAdapters (broken by a5641df)