Updated docker settings
Merge branch 'master' of github.com:nwinkler/dotfiles

* 'master' of github.com:nwinkler/dotfiles:
  Updated config