Fix the build
Reinstate grunt uglify production opts
Merge remote-tracking branch 'origin/master'