Use local underscored instead of requiring it
Update test
Merge branch 'master' into coffee

Conflicts:
	app/goodeggs_npm.coffee