fixed spec errors and added devise require
Merge

Merge branch 'master' of github.com:jlbrooks/quiver