Merge branch 'versions/0.7' into dev
Post release version bump to reflect dev now tracking what will
eventually become v0.8.0.
Merge branch 'versions/0.7' into dev
Fix for compilation warning/error on the lua_sandbox unit tests (OSX)
Fixed syntax error in IrcOutput example.

	modified:   irc.rst
Merge pull request #1051 from russellballestrini/rb-fix-defect-in-irc-example

Fixed syntax error in IrcOutput example.
Added MultiDecoder dependency ordering to address #1045
Added tests for nested MultiDecoders and added fixes as highlighted in #1052
Merge remote-tracking branch 'upstream/dev' into dev
Added bugfix note in CHANGES
Merge pull request #1052 from JustinJudd/dev

Added MultiDecoder dependency ordering to address #1045
Support environmental variables in config.
Test env variables in config
Unset env variable after test
Merge branch 'versions/0.7' into dev

Conflicts:
	CHANGES.txt
	CMakeLists.txt
	cmd/hekad/main.go
	docs/source/conf.py
	pipeline/config.go
Merge branch 'expand_envs_config' of github.com:ecnahc515/heka into ecnahc515-expand_envs_config

Conflicts:
	CHANGES.txt
Protect globals.Stopping with RWMutex.

Make globals.Stopping unexported and wrap writes/reads with methods that lock
on a RWMutex.
Adjust variable/method names
Update CHANGES.txt with globals.Stopping
Merge pull request #1056 from ecnahc515/protect_globals_stopping

Protect globals.Stopping with RWMutex.