Misc

- Markdown folding
- Merge bundles.vim into .vimrc
- ksdiff as merge & diff tool
- Removed many shadowing keymappings.