Merge branch 'new-cli'

.gitignore

Makefile

src/boost/format/exceptions.hpp

src/libmain/common-args.cc

src/libmain/common-args.hh

src/libmain/shared.cc

src/libmain/shared.hh

src/libstore/http-binary-cache-store.cc

src/libstore/local-binary-cache-store.cc

src/libstore/store-api.hh

src/libutil/args.cc

src/libutil/args.hh

src/nix-hash/local.mk

src/nix-hash/nix-hash.cc

src/nix/build.cc

src/nix/cat.cc

src/nix/command.cc

src/nix/command.hh

src/nix/hash.cc

src/nix/installables.cc