fix(gulp): adding gulp watch and server tasks
Merge branch 'master' of https://github.com/madeofpeople/starter into watch

Conflicts:
	gulp/watch.coffee
Merge pull request #1 from bassettsj/watch

fix(gulp): adding gulp watch and server tasks