Exit in a slightly less lurky way
Add a test that including thrift files in different directories works

Because the thrift compiler seems to be rather insensitive to reserved
tokens occurring even in contexts where they should be identifiers,
rename "service.thrift" to "user_service.thrift".