Re-ordering web2py tweaks to follow git_refresh
Merge branch 'master' into janrain-widget-update
Revised Janrain return URL (implicit app+controller)
Merge pull request #158 from OpenTreeOfLife/janrain-widget-update

Re-ordering web2py tweaks to follow git_refresh