updated app engine to 1.9.6
commented failing test
merged with Dan's travis-ci changes