rbenv
ignore pkill
neobundle.vim
aliases
rssv
bundles
no autochdir
ycm goto definition
zsh

Conflicts:
	.zsh/conf/aliases.zsh
wombat256
quote zz
c=z