Setup code in the right location, intelligently find the GAE install
Mend weird merge conflict