use more restrictive matching for serve-favicon version
fix(app-jshint): improve jshint usage

Changes:
- Update jshint task in `Gruntfile.js` to include `serverTest`
- Add `server/.jshintrc-spec` that extends `server/.jshintrc` with spec globals
- Use `"latedef": "nofunc"` instead of `"latedef": true` in `server/.jshintrc`
- Add assertion for `jshint` task in generator tests for `defaultOptions`
- Fix pre exsisting lint errors in `server` and `client`
- Change `getEmail()` in `client/app/account/settings/settings.controller` to use `user` arg and not `$scope.user`

Closes #463, #486
Merge pull request #482 from kingcody/fix/jshint

fix(app-jshint): improve jshint usage
update changelog
2.0.11
Revert "feat(oauth): multiple strategies per account; changeable email"

This reverts commit ef062728a2ec61d990fa87d965f2507b4bcc5b20.

Conflicts:
	app/templates/client/app/account(auth)/settings/settings.controller(coffee).coffee
	app/templates/client/app/account(auth)/settings/settings.controller(js).js
	app/templates/client/app/admin(auth)/admin(html).html
	app/templates/client/app/admin(auth)/admin(jade).jade
	app/templates/client/app/admin(auth)/admin.controller(coffee).coffee
	app/templates/client/app/admin(auth)/admin.controller(js).js
	app/templates/server/api/user(auth)/user.controller.js
	app/templates/server/api/user(auth)/user.model.js
	app/templates/server/auth(auth)/facebook(facebookAuth)/index.js
	app/templates/server/auth(auth)/facebook(facebookAuth)/passport.js
	app/templates/server/auth(auth)/google(googleAuth)/index.js
	app/templates/server/auth(auth)/google(googleAuth)/passport.js
	app/templates/server/config/_local.env.js
	app/templates/server/config/environment/index.js
update changelog
2.0.12
Merge branch 'master' into canary
Merge remote-tracking branch 'upstream/canary' into canary