Override Entrypoint picked up from the base image that breaks run commands in builder
Cleanup white space
uses the terminal size to display search output, add -notrunc and fix bug in resize
add if to prevent crash
Merge pull request #1163 from dotcloud/1137-change_search_size-feature

* Client : uses the terminal size to display search output, add -notrunc
Removing the save to disk as it was not really necessary
Override Entrypoint picked up from the base image that breaks run commands in builder
Merge branch '1156-entrypoint-builder' of github.com:kstaken/docker into 1156-entrypoint-builder
Merge pull request #1157 from kstaken/1156-entrypoint-builder

Builder: Fix #1156 entrypoint override from base image
* Hack: standardized docker's build environment in a Dockerfile
Merge pull request #1013 from dotcloud/standardize-build

* Hack: standardized docker's build environment in a Dockerfile
fix typo
Merge pull request #1170 from dotcloud/fix_type_socket

Fix typo socket