rename
some convenience
Merge branch 'master' of github.com:softprops/zoey

Conflicts:
	src/main/scala/client.scala