Organizing...
Merge branch 'master' of github.com:elkorn/dotfiles

Conflicts:
	dotfiles/.vim/vimrc