Move back to prefix notation for xserver vars.
Add xserver env file and checkout the grader code.
Fix some overzealous renaming.
Pull in 6.00x using git ssh.
Fix xserver upstart template issues.