Added delete method to users scenario
Revert "remove unregister devices"

This reverts commit d68967c2fada77ce765c3a0d77431d444308d5cf.
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into upstream/two-dot-o