openbox: change indent
support for diff'ing gpg keyrings
Merge branch 'master' of git://github.com/dannyedel/config-files