Two bug fixes

Addresses https://github.com/rafecolton/docker-builder/issues/119 and https://github.com/rafecolton/docker-builder/issues/118