Merge pull request #20 from johnpapa/develop

Develop
Merge pull request #21 from johnpapa/develop

Develop
Merge pull request #22 from johnpapa/develop

refactor to use gulp-useref over gulp-usemin ... lots of related changes and cleanup, too
Merge pull request #23 from johnpapa/develop

added editorconfig file, made gulp.config.js a module, removed double he...
indenting
Merge pull request #24 from johnpapa/develop

Develop
fixing up merge issues
Merge branch 'develop'

Conflicts:
	gulpfile.js
Merge branch 'master' into develop

Conflicts:
	gulpfile.js