Implemented Grunt stuff such as concat and minify
Reverted grunt changes while we wait for the fix
Point to correct directory for loading js