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
added confirmation for factorygirl users
added ruby version to Gemfile
Merge pull request #33 from LaunchAcademy/factory_repair

Factory repair
fixed tests, moved opt-out for email on user edit page
modified carrierwave to only submit to AWS in production
revamped review styling, how user images show
Merge pull request #25 from LaunchAcademy/usernames

Usernames
Merge pull request #34 from LaunchAcademy/styling-after-username-branch

Styling after username branch
conflicts resolved
fixed conflicts with master