Add proper dockerinit path support for distros that use FHS 2.3
Catch SIGQUIT for cleanup
Split auth on first colon
Only return published ports for docker port
Merge branch 'master' into handle_sigquit

Conflicts:
	server.go
Update Dockerfile with all-caps INSTRUCTIONS (as explained in docs as being "convention": http://docs.docker.io/en/latest/use/builder/#format)
Add -format to 'docker inspect'

This makes it a lot easier to script with docker instances as one can
ask for details about running instances more easily without having to
have additional JSON processing tools installed.

dotcloud/docker#734
Use inspect format to get IP address for psql example
CLI docs and examples of format
Merge pull request #2924 from tianon/strict-fhs-compatibility

Add proper dockerinit path support for distros that use FHS 2.3
Do not format at each write but use a Writer instead (build)
Fix displayJson behavior (dont add newline)
small reformatting jsonmessage
Merge pull request #2921 from dustin/inspect-format

Add -format to 'docker inspect'
Merge pull request #2957 from creack/handle_sigquit

Catch SIGQUIT for cleanup
Merge pull request #2982 from tianon/dockerfile-best-practice

Update Dockerfile with all-caps INSTRUCTIONS
Merge pull request #2965 from crosbymichael/no-private-port

Only return published ports for docker port
Merge pull request #2959 from crosbymichael/fix-auth-split

Split auth on first colon
Fix unit test with new buildfile prototype
Merge pull request #2998 from creack/fix_json_display

Fix json display