Add .jshintrc configuration
Allow dangling _ in variables
Merge branch 'master' into 2.0.x

Conflicts:
	.jshintrc