added name column to users
usernames display rather than emails
brought up to date with pagination
Merge branch 'master' into usernames
Merge branch 'master' of https://github.com/LaunchAcademy/caturday_funtime into usernames
fixed tests, moved opt-out for email on user edit page
modified carrierwave to only submit to AWS in production
Merge pull request #25 from LaunchAcademy/usernames

Usernames