Cambios mínimos, colorschemes añadidos
Merge branch 'master' of https://github.com/bodypheo/vim-config

Conflicts:
	vimrc