Removed redundant scheduler
Merge branch 'two-dot-o' of github.com:usergrid/usergrid into two-dot-o