Minor clean up
Merge branch 'DS-1008' of github.com:inbloom/secure-data-service into DS-1008