Upgrade to Clj 1.6
classpath tweaks