Added some more stuff about our X11 hacks, moved git screen before X screen, added check for X answer to determine if x-setup is run