Move setting of test config file into leiningen.
Merge branch 'master' into dev

Conflicts:
	project.clj