Merge branch 'master' of https://github.com/fisadev/fisa-vim-config

Conflicts:
	README.rst
Merge branch 'master' of github.com:maxiberta/fisa-vim-config
Merge branch 'master' of https://github.com/fisadev/fisa-vim-config

Conflicts:
	README.rst
Merge branch 'master' of github.com:maxiberta/fisa-vim-config