Fixed typo in git PS1
Merge branch 'master' of https://github.com/johan-carlsson/dotfiles
Merge branch 'master' of https://github.com/johan-carlsson/dotfiles
Added vimwiki plugin