Bump clojure version, minor type fixes

Bumped to Clojure 1.5 and really minor type updates.