Revert "Merging in latest master changes"

Reverts Altiscale/docker#1, going to go back and do a ff merge instead