delete a user + test
5s timeout for travis
udpate + test
test for PUT on 404
refactor mk_* and treq.* calls into re-usable things
Merge branch 'feature/issue-9-user-service-delete' into develop
Merge branch 'feature/issue-10-user-service-update' into develop