Gruntfile.js concatonation tweak (plus various other bits)