gitconfig: Disable annoying mergetool prompt and enable autosquash
gitconfig: Add merge-test alias
vimrc: Add markdown autocmds
bashrc: Enable vi-style editing
bashrc: Add mp an mplp aliases
awesome: Update eclipse shortcut
gitconfig: Add git verify alias
gitignore: Ignore LibreOffice lockfiles
bashrc: Disable vi-style editing
bashrc: Add environment variable and ssh alias for marvin
bashrc: Add aliases irgrep, ns
.xsession: Add htop to autostart apps
bashrc: Add rgrep alias
Update awesome config
vimrc: Set cryptmethod to blowfish
awesome: Add keepassx shortcut