Update from upstream

Updates from [upstream](http://github.com/thoughtbot/hound)