fixed issue with watch src for css
tweaked watch task
Merge branch 'master' of https://github.com/madeofpeople/starter into watch

Conflicts:
	gulp/watch.coffee