updated awesomewm-X to current working copy
merging