tried detailed logging
UpstreamError - NO TESTS
Merge branch 'master' into launch-err-log
removed RequestError
Merge branch 'master' into upstream-err

Conflicts:
	otter/controller.py
	otter/test/test_util.py
	otter/util/http.py
Body parsing in separate function - thanks @cyli

- details is a property
- not using __dict__
diff parsing for clb
checking task status deleting before listing servers
added description while displaying matcher
using server model's task_state property
better docs - thanks @lvh
Bump txkazoo to 0.0.5

This is a cleanup release. It is also available from the public PyPI
now, so local testing is a little easier.
doc change - per @kivattik
fix matches __ne__
Merge pull request #644 from rackerlabs/bump-txkazoo-to-0.0.5

Bump txkazoo to 0.0.5
getting servers in separate func - thanks @lvh
removed unused line
Upgrade olink-maven-plugin version to fix xinclude errors
Merge pull request #641 from rackerlabs/cafe-delete-server

Checking deleting task_state in cloudcafe
Merge pull request #645 from dwcramer/updateOlinkPlugin

Upgrade olink-maven-plugin version to fix xinclude errors