[WO-724] Optimise grunt build and watch tasks

* add grunt concat step before uglify
* split watch tasks for app and tests
I changed formatting to 2 spaced tabs here, so that we don't always fight with `npm install --save`