psql buffer filetype and Diff file changed on disk
Screen SSH socket in standard place
Merge branch 'master' of ssh://github.com/aarcro/dotfiles