Add fold level
Merge branch 'master' of github.com:robinedwards/dotfiles

Conflicts:
	vim/vimrc