Refactor Opts
Format main()
Change the default Host affectation to not rely on slice
Add proper dockerinit path support for distros that use FHS 2.3
Merge branch 'master' into refactor_opts

Conflicts:
	commands.go
Make volumes opts more strict
re-word the help for docker import to make it clear that this will be an empty image containing only the files in the tar file
Catch SIGQUIT for cleanup
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)
Merge pull request #2829 from dotcloud/refactor_opts

Refactor opts
Merge pull request #2728 from SvenDowideit/docker-import-doc

re-word the help for docker import to make it clear that this will be an empty image containing only the files in the tar file
Add contrb/zfs/ and add self as maintainer of ZFS storage driver.
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 #2995 from gurjeet/zfs_driver_owner

Add contrb/zfs/ and add self as maintainer of ZFS storage driver.
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)