convert user_roles column to text to accept more users
update gems for deployment
Merge branch 'develop'

Conflicts:
	deploy/Gemfile.lock
Merge branch 'develop'
version wants to merge...
add configuration around new email options
Merge branch 'develop' of github.com:sul-dlss/hydrus into develop