Merge branch 'vim-notes'
Merge branch 'vimrc-key-remap'
Merge branch 'tagbar-toggle'
re-added autoindent

indenting has been wonky.  maybe another setting is messing with it...
Merge branch 'indent-bugfix' into develop