Add config for virtual box
Latest rxvt setup
Latest gitconfig
Merge branch 'master' of https://github.com/emiel/dotfiles

Conflicts:
	git/gitconfig
Don't symlink gitconfig (causes issues in case of merge conflict)