Gruntfile fixes and varius template improvements