Re-added the vim-markdown directory
Merge branch 'master' of github.com:arnlaugsson/dotfiles
Don't share history between terminal sessions
Fixed merge conflict in git submodules - both added