Add grunt autocompletion
Cleanup setup to latest utils I use