add vagrant.el and vagrant tramp
merge master