Merge rebased develop onto master

This merges https://github.com/twitter/finagle/pull/325 into master.

git checkout develop

git rebase master
git merge origin/develop  # No diffs here, just merge history.

git checkout master
git merge develop   # Unifies history