account fixes and added support for roles based user locator
Merge branch 'master' of https://github.com/tunacasserole/omni