Merged in mgodshall/dockbake/minor-fixes (pull request #3)
Removed duplicate 'etc' in make-environment. Updated 'rm' flag due to '-rm' being deprecated.
Removed duplicate 'etc' in make-environment. Updated 'rm' flag due to '-rm' being deprecated.