Merge branch 'master' of github.com:dvonlehman/python-instagram into dvonlehman-master

Conflicts:
	README.md

Author: heatonjb

README.md

@@ -183,7 +183,7 @@ Locations: http://instagr.am/developer/endpoints/locations/
 ``` python
 api.location(location_id)
 api.location_recent_media(count, max_id, location_id)*
-api.location_search(q, count, lat, lng, foursquare_id)
+api.location_search(q, count, lat, lng, foursquare_id, foursquare_v2_id)
 ```
 
 Geographies: http://instagr.am/developer/endpoints/geographies/

instagram/client.py

@@ -130,7 +130,7 @@ def __init__(self, *args, **kwargs):
 
     location_search = bind_method(
                 path="/locations/search",
-                accepts_parameters=SEARCH_ACCEPT_PARAMETERS + ['lat', 'lng', 'foursquare_id'],
+                accepts_parameters=SEARCH_ACCEPT_PARAMETERS + ['lat', 'lng', 'foursquare_id', 'foursquare_v2_id'],
                 root_class=Location)
 
     location = bind_method(