More user functionality added.
Merge branch 'master' of github.com:floatingpointsoftware/grapevine