Mouse warp-patch
Merge branch 'master' of ssh://hax0r.se/home/dunz0r/homedir/configs

Conflicts:
	.conkyrc
	.moc/playlist.m3u
	.vim/.netrwhist
	.xinitrc
Modifier change