Merge in the things I like from the original hound styleguide