Introduce Compojure, and ring.middleware.json
Fix merge conflicts
Tidy hiccup page a bit