Move database.yml back into the tree
use travis db
more travis database
Merge branch 'master' into travis
more with travis db
more travis!
please travis work this time
Move controller_macros.rb into the devise.rb file in a vain
attempt to fix the uninitialized constant error on travis.
Merge branch 'master' into travis