docker updates, fix ctrl-r in tmux, remove auto-folding in vim
Merge