Merge branch 'mvexel/master' into auto-import

Conflicts:
	Overpass/Overpass.py
	Overpass/__init__.py
	Overpass/api.py
	README.md
	overpass/Overpass.py

Author: tbolender

README.md

@@ -4,25 +4,25 @@ This is a thin wrapper around the OpenStreetMap [Overpass API](http://wiki.opens
 
 ## Install it
 
-```
-python setup.py install
+```bash
+$ python setup.py install
 ```
 
 The module is not on PyPi yet.
 
 ## Use it
 
-```
->>> import Overpass
->>> api = Overpass.API()
+```python
+>>> import overpass
+>>> api = overpass.API()
 >>> response = api.Get('node["name"="Salt Lake City"]')
 ```
 
 Note that you don't have to include any of the output meta statements. The wrapper will, well, wrap those.
 
 You will get your result as a dictionary, which (for now) represents the JSON output you would get [from the Overpass API directly](http://overpass-api.de/output_formats.html#json). So you could do this for example:
 
-```
+```python
 >>> print [(feature['tags']['name'], feature['id']) for feature in response['elements']]
 [(u'Salt Lake City', 150935219), (u'Salt Lake City', 585370637), (u'Salt Lake City', 1615721573)]
 ```
@@ -35,13 +35,17 @@ The API takes a few parameters:
 
 The default endpoint is `http://overpass-api.de/api/interpreter` but you can pass in the rambler instance (`http://overpass.osm.rambler.ru/cgi/interpreter`) or your own:
 
-    api = Overpass.API(endpoint=http://overpass.myserver/interpreter)
+```python
+api = overpass.API(endpoint=http://overpass.myserver/interpreter)
+```
 
 #### `timeout`
 
 The default timeout is 25 seconds, but you can set it to whatever you want.
 
-    api = Overpass.API(timeout=600)
+```python
+api = overpass.API(timeout=600)
+```
 
 #### `debug`
 

Overpass/__init__.py renamed to overpass/__init__.py

@@ -1 +1 @@
-requests==2.3.0
+requests>=2.3.0

Overpass/api.py renamed to overpass/api.py

@@ -1,9 +1,9 @@
-import Overpass
+import overpass
 
 
 class TestAPI:
 
     def test_initialize_api(self):
-        api = Overpass.API()
-        assert isinstance(api, Overpass.API)
+        api = overpass.API()
+        assert isinstance(api, overpass.API)
         assert api.debug == False