Update docker port
Format json
Back to just git
Merge branch 'master' of github.com:silas/dotfiles