Altiscale/docker — pull request #2 by adamb-altiscale (2014-12-12 18:56:46+00:00)
Title: Revert "Merging in latest master changes"

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