update before installing
Support custom OPAM builds from source via `make cold`
Merge branch 'master' of github.com:avsm/docker-opam

Conflicts:
	build.sh
	opam-installext
	scripts/ubuntu-trusty/Dockerfile