don´t delete, make backup
start dwm instead of awesome
use xml for roslaunch files
swig syntax highlighting
add MLR_PATH
Merge branch 'master' of git://github.com/hildensia/dotfiles

Conflicts:
	X11/xinitrc
	vim/vimrc
	zsh/zshenv
Merge branch 'master' of git://github.com/hildensia/dotfiles
some more bundles