Restructure files
Restructure files
Merge branch 'master' into rewrite

Conflicts:
	lib/index.js
	test/index.js
Change indentation, and fix some coding style
Refactor tests
Update dependencies
Fix linting
Don't run mocha here
Update .jshintrc
Update dependencies, fix deprecated uses
I don't know why, but gulp-jshint doesn't seem to automatically find the .jshintrc
Coding style
Cast instead of toString()
No longer needed