Merged UserInfo into SiteUser table

Closes #23