Merge stuff
Merge branch 'master' of github.com:hellyeahllc/toothpaste

Conflicts:
	Makefile
	bower.json
	lib/header.js
	toothpaste.js