Reverting default tramp method to plink because it broke file editing
via sudo.
Abbrev update
Merge branch 'master' of github.com:louisdion/.emacs.d

Conflicts:
	init.el