minor changes
Merge branch 'master' of github.com:daniperez/dotfiles

Conflicts:
	.vimrc
closing scratch after selecting something by autocomplete