Dependency and other cleanup.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o