Added bugfix note in CHANGES
Merged nested multidecoder dependency fix from dev to versions/0.7 branch.

Conflicts:
	pipeline/config.go
	pipeline/multidecoder.go
Fix for compilation warning/error on the lua_sandbox unit tests (OSX)
Improve TcpInput and TcpOutput handling of keep_alive_period default
interval, and update docs to include keepalive info.
Merge pull request #1055 from mozilla-services/tcp_keepalive_docs

Improve TcpInput and TcpOutput handling of keep_alive_period default
Add resource links to docs index page.
Merge pull request #1057 from mozilla-services/doc-frontpage-resources

Add resource links to docs index page.
Post release version bump 0.7.1 -> 0.7.2.
Add dockerfiles to repo.
Update build_docker.sh and add instructions for building Docker images.
Add Docker usage example
Better emphasis on sections being files
Fix docker image tag
build_docker.sh: Exit on first failed command
Full heka+docker example
Added a much simpler bootstrap example to the beginning of the
Getting Started docs section, per user request.
Dont name intermediary container for build
Merge pull request #1068 from mozilla-services/simpler-getting-started-example

Added a much simpler bootstrap example to the beginning of the
Merge branch 'versions/0.7' into dev

Conflicts:
	CHANGES.txt
	CMakeLists.txt
	cmake/externals.cmake
	cmd/hekad/main.go
	docs/source/conf.py
	pipeline/config.go
Grammar changes