Switch back to jellybeans and fix a bug with Startify and cd in Vim
Merge branch 'master' of github.com:daGrevis/Dotfiles

Conflicts:
	zsh/.zshrc