Screen config
Merge branch 'master' of sarcasm.ath.cx:misc
Merge branch 'master' of github.com:paul-schwendenman/misc