upstream merge
Merge remote-tracking branch 'upstream/master'
rails g devise:views
Gravatar image shown on user profile page
Cloned squmblr, edit email and password works
Tests for blank email, wrong pw confirmation
converted registrations edit.html to haml
add username login
cleaning up code
still cleaning up code
further cleaning code
last clean up
Merge branch 'master' of https://github.com/elizabrock/squmblr
merging eliza's master with local
remove unused generated files
Change config/routes to use resources user
User can recover password with email or username
fixed some whitespace
test refactored
including schema changes
Merge branch 'master' of https://github.com/JamesNix/squmblr
merging with Giovanni's refactored tests