Added M+{up,down,left,right} keys for media shortcuts on older keyboards
Merge remote-tracking branch 'github/master'

Conflicts:
	xmonad.hs