Clean up
Merge branch 'master' of github.com:finagle/finch