devise setup
user setup
Merge branch 'devise' into develop
Merge branch 'develop' into layout
layout?
Merge branch 'layout' into develop
rspec setup
guard
Merge branch 'develop'
Merge branch 'master' of github.com:rickr/rump