Merge branch 'kyle'
Added wpmu_signup_user_notification
Added wpmu_signup_user_notification
Merge branch 'cory' into kyle

Conflicts:
	inc/multisite_overrides.php