Don't load all URLs; only load the ones we might use
Merge branch 'master' into mikeage.net_theme