Fix issues with tmp files and inline comments in vimrc
Merge remote-tracking branch 'refs/remotes/origin/master'