Merge branch 'kyle'
Merge branch 'kyle'
Merge branch 'kyle'
Worked on the default_email functionality, added default_email template creation
Merge branch 'kyle'
Merge branch 'master' of https://github.com/sendwithus/sendwithus_wordpress
Merge branch 'kyle'
Added default email to all functions, updated some variable names for consistency, fixed function for default template creation
Fixed a slight error
Fixed a slight error
Merge branch 'kyle'
Fixed issue with subject line, minimized code, merge ready
Merge branch 'cory'

Conflicts:
	inc/multisite_overrides.php
Merge branch 'master' into kyle