formatted the web.config and added authentication to the elmah stuff.
Merged changes in and fixed conflicts.