Pulling changes from vicmortelmans/yql-tables.

Fixing conflicts:
	geo/geo.geohash.xml
Squashed commit of the following:

commit abba7f0f2917e3715b87f0b6c2679fee235e38b1
Author: Kelvin Luck <git@kelvinluck.com>
Date:   Mon Apr 19 14:40:45 2010 +0100

    Testing a combination of the placemaker service
    with twitter search to grab location data from the
    contents of tweets...

commit 55c9358536dccc6554fa557f1fc965bf45020a8c
Merge: 7addfd5 ff5001b
Author: Kelvin Luck <git@kelvinluck.com>
Date:   Mon Apr 19 14:31:49 2010 +0100

    Merge branch 'master' of git://github.com/spullara/yql-tables

commit 7addfd557a2c49c2d65e287a4f5cc26e78d6adbe
Author: Kelvin Luck <kelvinluck@k2000.local>
Date:   Sat May 30 14:06:37 2009 -0700

    Added the new flickr.photosets.getPhotos to the env file

commit 2245c066ac479d3abb4c39b8dcf5875ca3e07092
Author: Kelvin Luck <kelvinluck@k2000.local>
Date:   Sat May 30 14:04:15 2009 -0700

    Grabbing the XML for the parent photoset object rather than just the array of photos (as this topmost node also contains useful information)

commit 1d957b3990bc22afa5389e3be1c9832a190f583d
Author: Kelvin Luck <kelvinluck@k2000.local>
Date:   Sat May 30 13:59:44 2009 -0700

    Corrected the path to the results in the returned XML

commit 8ee67ac2e1b767c1c13366cee0e239c26c612f44
Author: Kelvin Luck <kelvinluck@k2000.local>
Date:   Sat May 30 13:57:02 2009 -0700

    Making the API key not private to try to debug...

commit 5a0ed1afca3fe99ba945e8134191e8c7609c8e27
Author: Kelvin Luck <kelvinluck@k2000.local>
Date:   Sat May 30 13:51:22 2009 -0700

    Adding a valid API key

commit ecd9c0bf42f19d43e6e945d834f075847eb610bc
Author: Kelvin Luck <kelvinluck@k2000.local>
Date:   Sat May 30 13:47:00 2009 -0700

    Tweaking pagination parameters to try and get it to work

commit 7196cbb4d143513c3eb1f9eb1f9499e472dd7a5b
Author: Kelvin Luck <kelvinluck@k2000.local>
Date:   Sat May 30 13:42:38 2009 -0700

    Added a definition of a table for flickr.photosets.getPhotos