Gruntfile fix and tweaks

* fixed watch task
* uglifier removed for now