Sync env before trip (minor additions)

Files not found in $HOME will get copied (vimdiff only if both present and differ)
Merge branch 'master' of https://github.com/lukmdo/dotfiles