random changes
Merge branch 'master' of github.com:achan/dotfiles

Conflicts:
	vimrc