Ignore the vim_mru_files file
Merge branch 'master' of https://github.com/sanp/dotfiles

Conflicts:
	.gitignore
	vim_mru_files