Stop overriding the endpoint when it's provided without a token

Add a default clientrc file
Merge branch 'master' of https://github.com/Aghoreyshi/python-barbicanclient

Conflicts:
	barbicanclient/client.py