Changes
Merge branch 'master' of ssh://github.com/jsvana/dotfiles

Conflicts:
	vimrc