lock devise to 2.x
Merge branch 'master' of github.com:koedbymonkey/blahg