Merge branch 'master' of github.com:oubiwann/clj-rackspace into server-payload

Conflicts:
	src/rackspace/api.clj