Bump ruby version to 2.1.1 for security fix
Use email as default if name is null
Push default email logic back on model