Users and Organizations branch

Looks like I got some ga_* when I updated line endings.