Merge branch 'contacts'
Upgrade Rspec, fix specs
Update users
Merge branch 'master' into contacts