add vim calendar plugin
small update to i3 config
fix some issues with urxvt
Merge branch 'master' of github.com:flavio/dotfiles

Conflicts:
	.gitmodules