Merge pull request #65 from thoughtworks/recursive_locking_workaround

Merging the workaround.  `rake notes` shows the tech debt if anyone wants to pick them up.
Merge pull request #64 from thoughtworks/validations

Merging the rspec matchers.  Subject if we come up with better DSL ideas, but this is a good start.
Merge remote-tracking branch 'origin/master' into location_header