Fix for weird results from jshint
Merge remote-tracking branch 'upstream/master' into fix-9

Conflicts:
	main.js
Merge pull request #16 from busykai/fix-9

Fix #9. Load .jshintrc if present.
doc update, version update
Merge branch 'master' into fix-9-new-fs