braceccl amongst others
Merge branch 'master' of github.com:finbarrocallaghan/dotfiles
vcs_info doesn't work on 4.3.10
Merge branch 'master' of github.com:finbarrocallaghan/dotfiles

Conflicts:
	zshrc
losing jedi-vim, and changing fold toggle