update rake and json. Stops zeus from failing
Style fixes and some more specs