go 1.3.1 update
make is now installed (again)
merged in upstream from wercker_docker/wercker-labs-docker and resolved conflict in docker.json