Fixes broken tests, updates gem dependencies
Merge branch 'hotfix/2014-02.2.5'