Fix macros
Merge branch 'master' of github.com:clojurewerkz/cassaforte

Conflicts:
	src/clojure/clojurewerkz/cassaforte/client.clj