steve fixed algo
working algo and tests
fixed something in kimono model
Merge pull request #17 from bobolinks-2014/algo-fix

Fixed algo; tests passing.