Adding .editorconfig
Updates to the grunt build file and meta data
Merging