update vimrc
add template
Merge branch 'job'
unmap [b and ]b, delete spell
Merge from job branch and add orig to .gitignore
update vimrc
add plugin indent-guides and ignore .hi
Meger from master branch