Updated Xresources for laptop
Merge branch 'master' of ssh.github.com:atextor/dotfiles
Added check for setterm, to stop annoying messages on arch linux