Add vim-markdown plugin
Alias git as hub if hub installed
Fix merge conflicts