Merge pull request #1 from whitelynx/master

Several minor fixes to xpybutil
Merge branch 'master' of gh:BurntSushi/xpybutil