change .jshintrc indent from 4 to 2
Merge branch 'master' of github.com:rathbun-kennewick/backbone-cms

Conflicts:
	.jshintrc