config updates
Merge branch 'travis-ci-stack' of github.com:r3b/usergrid-1 into travis-ci-stack