Added Concat

Running concat insetad of uglify for dev
Merge branch 'master' of https://github.com/folbert/my-grunt