7/28/14 build 2

Cleanup X11/X13 options