merging 5871ce4 from @mariomc's grunt branch
Adding Gruntfile.js
Changing Ink's description
Changing Aux to Common
Adding placeholder for contrib folder
Add to Gruntfile.js the tasks we had in Makefile before we get to the massive overhaul
sinon timers on IE
whitespace
adding node_modules to gitignore
merging changes from develop
moving stuff around
bad package.json
updating MakeFile to new directory structure
updating gitignore to new structure
gruntfile, new directory structure