Fixed some settings in vim
Merge branch 'master' of https://github.com/dablak/dotfiles
Added some more aliases