Removed "this" from functions, breaks mixins

Conflicts:
	lib/name.js