Fixed the merge, on a separate branch for this laptop now.
Fixes to make XMonad look nice and behave on the laptop.

The conky pager looks nice and works now, and has been edited to
support this machine.