speed up watch task
merge upstream
add time-grunt
Merge pull request #111 from ascott1/better-build

Speed up watch task