Merge of Greg Changes.
added grunt.js...in the future we'll just use Python like MKenny mentioned