main site changes
some bug fixes on main site + end of merge conflict
dumb error log stuff, need to get rid of it
fixed emailconfirmation mixup