Updated default gravatar image and added ENV variables to development.rb for email
Merging conflicts
Merging with master
Merge branch 'master' of https://github.com/jeffthestampede/cssdash
Fixed Edit Profile bug
Merge pull request #24 from miclowe/master

Fixed Edit Profile bug