Merge changes.

Also have GAE running so these are actually tested! Woo!