Oops, got the nesting wrong on that last one.
Merge branch 'master' of https://github.com/technomancy/leiningen

Conflicts:
	leiningen-core/src/leiningen/core/project.clj