Added user avatar through paperclip and AWS S3
resolve merge conflicts for master to dm_gravatar branch
Merge branch 'master' into dm_gravatar
Merge pull request #6 from rvirani1/dm_gravatar

Add profile image uploads