modified xmonad.hs, ponymix and udiskie PYTHONPATH
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.xinitrc
ponymix