Cleanup template spacing
Fix weird auto-logout

Using ubuntu, xmonad would immediately logout upon login. I did not
figure out why, but cleaning up the code fixed it.
Add spec for sapporo