Adding User controller spec
Updating Puma
Merge branch 'master' into feature/sites