update xmonad.hs
minor cleanup
use upstream instead of tracking which has been deprecated