Merge remote-tracking branch 'my/dev-jshint-compliant' into dev-jshint-compliant

* my/dev-jshint-compliant:
  Add .jshintrc to project

Conflicts:
	.jshintrc
Merge branch 'dev-jshint-compliant' of https://github.com/adamrights/intentionjs into dev-jshint-compliant

* 'dev-jshint-compliant' of https://github.com/adamrights/intentionjs: