Add `nickname` to info hash.

Also, expose a `nickname_key` setting, defaulting to 'user'.
Merge branch 'master' of github.com:chamill/omniauth-cas into chamill-master

Conflicts:
	lib/omniauth/strategies/cas.rb
Merge branch 'chamill-master'