Add screen detection to xdisp.
Merge branch 'master' of github.com:sergevanginderachter/dotfiles

 Changes to be committed:
	modified:   .i3/config
	new file:   bin/lock
	deleted:    bin/lock-suspend
	modified:   bin/setbg
	deleted:    bin/vagrant