Merge pull request #1012 from daemianmack/patch-1

Fix typos.
Merge branch 'master' of https://github.com/benjaminsavoy/leiningen

Conflicts:
	leiningen-core/src/leiningen/core/project.clj
Replace `main` ns with `log` where forgotten.
Resolve failing test introduced by *warn*.

Also move abort-msg up to leiningen core and call it from the leiningen
test helpers package instead.
Add in old fns to avoid breakage in plugins.

Also tag them as deprecated. (Since I was a bit too eager on this one,
feel free to revert to before the merge if the changes aren't worth it.)
Update src/leiningen/with_profile.clj

Replace `main` ns with `log` where forgotten.
Merge pull request #1014 from deduktion/patch-2

Update src/leiningen/with_profile.clj
Merge pull request #1006 from cldwalker/document-global-options

document global options in help task, close #1005
Fix lein test exit code when :eval-in :leiningen

Lein test was always exiting with 0 when :eval-in :leiningen was used.
Merge pull request #1018 from hugoduncan/feature/fix-test-exit-code-for-eval-in-leiningen

Fix lein test exit code when :eval-in :leiningen
Log classpath files at debug in get-classpath

Logging the classpath facilitates diagnosis of classpath issues.
Merge pull request #1019 from hugoduncan/feature/log-classpath

Log classpath files at debug in get-classpath
fix tests broken by change in error format
Merge pull request #1020 from cldwalker/fix-new-tests

fix tests broken by change in error format
Fix FAQ formatting; link to "Faster" wiki page.

Note that the two spaces after each Q line are intentional; otherwise
we don't get proper line breaks.

[ci skip]
Tweak tutorial.
Fix some typos
Merge remote-tracking branch 'hugoduncan/feature/fix-recursive-alias-993'

Conflicts:
	leiningen-core/test/leiningen/core/test/project.clj
Force usage of newer dynapath until pomegranate updates.

This fixes the issue causing the build failures. The root of it is
that dynapath was allowing pomegranate to modify the boot classloader,
which caused multiple copies of the same class to be loaded.
Merge pull request #1022 from tobias/dynapath-update

Force usage of newer dynapath until pomegranate updates.