some local changes
Merge branch 'master' of https://github.com/gaperez64/scripts

Conflicts:
	vimrc