Fix up the alias handling some more, such as deleting the old aliases on...

Fix up the alias handling some more, such as deleting the old aliases on delete and migrate. Also fixed the email routines to point to the right file now that the conditional includes are in their own directory