Merge remote-tracking branch 'upstream/master'
Add an .editorconfig file
Move history to CHANGELOG.md
Move jshint settings out into .jshintrc
Ensure jshintrc is valid JSON
Merge pull request #3 from davidrapson/master

More cleanup