Allow different queries to be run through the q GET parameter.
Make 5 pubs really 5 pubs and not 50.
Explicitly set a higher timeout (3 mins).
Merge branch 'master' of github.com:derickr/3angle

Conflicts:
	fetch-poi.php