Merging from codahale/dropwizard

Merging from codahale/dropwizard master