Update Build for GAE

GAE optimizations to tidy up a little for building