fixes from code review
Merge branch 'rewrite' of github.com:AppScale/appscake into rewrite