set backup on and set directories to ~/vim/backup and ~/vim/swap
Merge branch 'master' of https://github.com/kennyalmendral/vim

Conflicts:
	_vimrc
set backup dir to ~/vim/backup/ and swap dir to ~/vim/swap/