Moves `ember watch` command to `ember build --watch`
Merge branch 'master' of github.com:kevincolyar/ember-tools

Conflicts:
	src/commands/build.js