some stuff
Merge branch 'master' of https://github.com/wilsoniya/dotfiles

Conflicts:
	vimrc