Update Pop branch (yaml cleanup)
Merge branch 'jon' into pop
Merge branch 'jon' into pop
Updated POP branch
Merge branch 'jon' into pop

Conflicts:
	app.yaml
Pop branch landing page fixes
App.yaml fixes after "pop" merge