Minor fixes
Merge branch 'finagle-smtp' of https://github.com/suncelesta/finagle into finagle-smtp

Conflicts:
	finagle-mysql/src/test/scala/com/twitter/finagle/mysql/unit/RequestTest.scala

pull