Default value for webmaster_email
Removed those .orig files (Produced by git mergetool)