Re-ordering web2py tweaks to follow git_refresh