more updates
Merge branch 'xstools' of git://github.com/itsme-/server.configs