ahhhhhh
Merge branch 'master' of github.com:ellbur/dotfiles

Conflicts:
	inkscape/preferences.xml
	vlc/vlc-qt-interface.conf
	vlc/vlcrc