accidentaly reset
Merge branch 'zsh' of http://github.com/cmtm/dotfiles into zsh

Conflicts:
	.vimrc