Fixed up some things from my other branch.
Merge branch 'features'

Conflicts:
	.gitignore
	gulpfile.js