Interesting. So -- can you just keep the diffs to appspot.py *itself* local to your git repo?
In any case, it's important that you make progress conveniently. :) If it would make your work significantly easier for some reason, then, without further comments: LGTM http://codereview.appspot.com/90069
