Merge branch 'master' of github.com:nadeemsyed/clj-rackspace

Conflicts:
	src/rackspace/const.clj
	test/rackspace/const_test.clj