Changed mapleader + some settings
Merge branch 'master' of https://github.com/pilf/vim-files

Conflicts:
	.vimrc