0.9.3 upgrade

Merges clojars 0.9.2 functionality with Dan's upgrade