Merge branch 'dropwizard-0.7.0' of github.com:bbeck/ostrich into dropwizard-0.7.0