Some vim and xmonad config changes
Merge branch 'master' of github.com:ashaiber/settings
Merge branch 'master' of github.com:ashaiber/settings