Minor changes
Clean up choices iteration
Updated varaibles for choices iteration
Merge pull request #156 from topless/patch-1

Clean up choices iteration
Now used flask-oauth v0.13 from GitHub.
Merge pull request #157 from gmist/increase_flask_oauth

Now used flask-oauth v0.13 from GitHub
Merged with gae-init