Address issues arising from actually installing this.

This commit addresses issues caught when trying to install tower-cli
into system Python.