replace node-static with ecstatic
update README
update watchify
Merge branch 'master' into angular

Conflicts:
	gulpfile.coffee
	package.json