Jump through jumpbox, not to
Merge branch 'work'
vimrc tab stops, git trim_branches
Merge branch 'work'