Updated Codox plugin to 0.6.4
Tests with Clojure 1.5.1
Released 1.0.3
Merge branch 'master' into clojurescript

Conflicts:
	project.clj
Merge branch 'clojurescript' of github.com:r0man/hiccup into clojurescript

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.