Replaced use of non-standard linux defines
Merge branch 'master' of git://github.com/apetrone/xwl
General cleanup on osx