Export GetEndpointType so I can use it in Rackspace.
Shuffle imports to avoid collisions.
Remove an unnecessary Network service.

Signed-off-by: Ash Wilson <ash.wilson@rackspace.com>
Remove an unnecessary import.

Signed-off-by: Ash Wilson <ash.wilson@rackspace.com>