updated xmodmap
Merge branch 'master' of github.com:JohnnyMudcrab/dotfiles
updated vimrc