Added Grunt.js and moved to combined and minified files