.bashrc: pandoc Webengineering, gvim as EDITOR, IP Adress Android Remote Keyboard.
Merge branch 'master' of https://github.com/MazeChaZer/dotfiles
Added .Xmodmap, make caps lock act as a second escape key.