some more cleanup
Merge remote-tracking branch 'origin/master' into broccoli-fun

Conflicts:
	Brocfile.js
	package.json