xmonad: smart borders (no border full screen)
Merge branch 'master' of github.com:bitterjug/dotfiles

Conflicts:
	xmonad/xmonad.hs
merge