Update min lein to match Travis CI's current version.
Work around lein ring running tests on reload: https://github.com/weavejester/lein-ring/issues/68
Remove Stijn's composing defresource macro since it was incorporated into liberator. Switch to the built in resource composition. https://github.com/clojure-liberator/liberator/pull/97
Merge branch 'master' into collection_api_tests