Make travis green again
Revert "Make travis green again"

This reverts commit af3d11b2308b0c0a0f1c53952e18fa3e9ce3ea10.
Revert "Remove unused v1/users endpoint for now"

This reverts commit e513dd87cff48c3d3a26004e38948aa90083e462.