Consistency/style cleanup
Merge branch 'master' into horse

Conflicts:
	horse.user.js