Sort bundles
Add matchit.vim
Remove unused mappings
Add html and txt indenting settings