Merge pull request #1 from delaneyphx/master

Test
Merge branch 'devise' of https://github.com/delaneyphx/testbgapp into devise
Merge pull request #2 from delaneyphx/devise

Devise