Revert "XQuartz 1.1.1"

This reverts commit 0318bfd96e5f91413cb3276888e08ef553b4a646.
Merge branch 'mavericks3' of https://github.com/plyfe/our-boxen into mavericks3