Added relevant fixes.
Merge branch 'master' of https://github.com/slode/Dotfiles
Made backup of my .vimrc
Merge branch 'master' of https://github.com/slode/Dotfiles

Conflicts:
	vim/vimrc.symlink
Removed vim.symlink.
Merge branch 'master' of ssh://github.com/slode/Dotfiles