Updates 2013-03
Merge branch 'master' of https://github.com/qeny/dotfiles

Conflicts:
	xbindkeysrc