Expanded data types for conversion to/from model/Java types

Moar data types. Included UUIDs, since these get a bit of use in Clojure.

Updated Clojure to 1.6.0. This led to warnings from midje, so it was updated as well (this removed the warnings).

Also tweaked some of the formatting in tests (particularly the :use directive).