Merge branch 'dylan' into kyle
Change file layout, removed filter_overrides.php
Fix of wp_new_user_notification and addition of swu_newuser_notify_siteadmin.
Merge branch 'kyle'
Re-did wpmu_welcome_notification and wpmu_welcome_user_notification
added default messages
added stylesheet support
added stylesheet support
added stylesheet support
Merge branch 'master' into derp

Conflicts:
	inc/multisite_overrides.php
added stylesheet support