various changes I forgot to commit
Merge branch 'master' of github.com:cboggs/dockerfiles