Update
Merge branch 'master' of https://github.com/sw4/pocketknife

Conflicts:
	Gruntfile.js