More changes then I care to remember...
Merge branch 'master' of ssh://hax0r.se/home/dunz0r/homedir/configs

Conflicts:
	.conkyrc
	.dwm/config.h
	.moc/last_directory
	.moc/playlist.m3u
	.vim/snippets/c.snippets
	.xinitrc
Xinitrc changes
Vimperrator!
Commented
Added todo.sh
Work on todos
Removed now-playing from statusbar
New stuff in the configurations
Todo.txt config added
Todo.sh added
Merge branch 'master' of hax0r.se:homedir/configs

Conflicts:
	.aliasrc
	.local/share/luakit/history.db
	.todo/config