tramp config tweaks and other work tweaks
Merge branch 'master' of github.com:steder/dotfiles

Conflicts:
	emacs.d/personal/ms-appearance.el
	emacs.d/personal/ms-programming-languages.el