clean up README, make and configure

README.md

@@ -12,16 +12,15 @@ The style is still a work in progress and you are encouraged to use the
 implementation. 
 
 [Carto]: http://github.com/mapbox/carto/
-[TileMill]: http://tilemill.com/
+[TileMill]: https://www.mapbox.com/tilemill/
 [issue tracker]: http://github.com/mapbox/osm-bright/issues/
 
 Setup Instructions
 ------------------
 
 ### 1. Download shapefiles
 
-OSM Bright depends on several large shapefiles. You should start downloading these
-now so that they are ready later when you need them for rendering.
+OSM Bright depends on two large shapefiles. You will need to download and extract them before continuing. 
 
 Download them to the `shp` directory in the osm-bright folder. You can do this with `wget` like:
 
@@ -42,7 +41,7 @@ shapeindex land-polygons-split-3857.shp
 
 [Shapeindex for Windows]: http://mapnik.s3.amazonaws.com/dist/archive/shapeindex-2.2.0-win-x86_32.zip
 
-### 2. Set up PostgreSQL & PostGIS ###
+### 3. Set up PostgreSQL & PostGIS ###
 
 If you don't already, you need to have [PostgreSQL][] installed & running with
 a [PostGIS][] database setup within it. See the [PostGIS documentation][1] for
@@ -52,7 +51,7 @@ full information on how to do this.
 [PostGIS]: http://postgis.refractions.net/
 [1]: http://postgis.net/documentation
 
-### 2. Import OpenStreetMap data ###
+### 4. Import OpenStreetMap data ###
 
 You will need an OSM database extract in one of the following formats:
 
@@ -96,7 +95,7 @@ See `man osm2pgsql` or the [online documentation][5] for more details.
 [osm2pgsql]: http://wiki.openstreetmap.org/wiki/Osm2pgsql
 [5]: http://wiki.openstreetmap.org/wiki/Osm2pgsql
 
-### 3. Edit the configuration ###
+### 5. Edit the configuration ###
 
 You'll need to adjust some settings for things like your PostgreSQL connection
 information.
@@ -116,7 +115,7 @@ information.
    comments in the configuration file for more information.)
 8. Save & close the file.
 
-### 4. Run make.py ###
+### 6. Run make.py ###
 
     ./make.py
 

configure.py.sample

@@ -1,8 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-#!/usr/bin/env python
-
 from os import path, getcwd
 from collections import defaultdict
 config = defaultdict(defaultdict)
@@ -35,7 +33,8 @@ config["postgis"]["extent"] = "-20037508.34,-20037508.34,20037508.34,20037508.34
 
 # Land shapefiles required for the style. If you have already downloaded
 # these or wish to use different versions, specify their paths here.
-# These OSM land shapefiles are updated daily and can be downloaded from: 
+# You will need to unzip these files before running make.py
+# These OSM land shapefiles are updated daily and can be downloaded at: 
 # - http://data.openstreetmapdata.com/simplified-land-polygons-complete-3857.zip
 # - http://data.openstreetmapdata.com/land-polygons-split-3857.zip
 

make.py

@@ -1,8 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-#!/usr/bin/env python
-
 import re
 import sys