server task uses watch main (fix #22)
Merge branch 'ember-app-kit'