changes postfix to sendmail in email configuration
tidying up loose files after rebuild
edits .gitignore to bring down the the right files
sorts out conflict on .gitignore

Conflicts:
	.gitignore