added gulp to prereqs
Merge remote-tracking branch 'delek-web/master' into bye-compass

Conflicts:
	README.md
no i wanted that