Conflicts:
	src/rebar_xref.erl

rebar_eunit:reset_after_eunit/1 mustn't remove 'included_applications'

External deps_dir should have higher priority than the config one

The external deps_dir should have higher priority because
it is used by scripts and other build tools to set up the
location of the dependencies. This commit ensures that,
even if a project has set deps_dir in its config file has
lower preference than the command line one.

Add latest version getopt that automatically wraps usage output lines

Fix file handling on windows for tests

Correct ext of neotoma output file

Ensure we always have a `registered` value in `.app` files

Allow specifying eunit suite run order in 'suites'

Implement merged overlays

Remove leading empty line from a template

This commit fixes issue #98 by removing the ERL_LIBS and REBAR_DEPS_DIR
from the list of environment variables exported by the rebar_port_compiler
plugin.

Sync test/upgrade_project/rel/files with priv/templates

Use "pwd -P" to get the current physical path.

Support for QuickCheck Mini

Add support for ping command on windows in the simple node runner

It is a portable version of the realpath(1) utility that you can find on
Mac OS X and FreeBSD (see also The Open Group Base Specifications Issue
6, IEEE Std 1003.1).

Without the -P flag, pwd(1) might return different values when the
current path contains one or more symlinks, depending on how you got
into the current directory.

In simplenode.runner, this may cause PIPE_DIR to have different values
on each use, which will make it impossible to connect to the running
node unless you guess the correct path yourself.

Fix searching for plugins

If a plugin is in a dependency, rebar didn't search for it carefully
enough.

Add rebar-deps env to port compiler SharedEnv

REBAR_DEPS_DIR is often needed when a nif needs to be linked with a raw
dependency.

Travisci fixes

Do not compile nodetool escript

Since R15B02, ct_run returns a non-zero exit code when some tests
failed or were auto-skipped. (See ticket OTP-9865.)

This fix makes it so a non-0 code doesn't cause an instant failure, but
still prompts for log verification before doing so. Given the behaviour
was acceptable for pre-R15B02, it should be valid with it with
post-R15B02.

The fix should also be backwards compatible.

This removes the dependency on lib/compiler in an OTP release.

More error logging

rebar throws away some error messages, e.g. the ones generated if the yecc compiler is broken.

simplenode.reltool.config: use default sys-level mod_cond setting

Makefile: call Dialyzer with -nn flag

As discussed here
http://erlang.org/pipermail/erlang-questions/2012-December/071135.html
change the reltool spec to use the default sys-level mod_cond setting.

This allows overlay_vars to merge comma delimited var config files

This speeds up 'make dialyzer' for the common case of Erlang/OTP built
without --enable-native-libs.

Fix unicode

rebar_core: fix sub dir association