DRY'd up that user regex.

Conflicts:
	Rakefile