Merge branch 'master' into csv-disk-index

.travis.yml

@@ -31,12 +31,12 @@ matrix:
     - os: linux
       compiler: gcc
       env: JOBS=6
-    #- os: osx
-    #  compiler: clang
-    #  env: JOBS=8 MASON_PUBLISH=true
-    #- os: osx
-    #  compiler: clang
-    #  env: JOBS=8 COVERAGE=true
+    - os: osx
+      compiler: clang
+      env: JOBS=8 MASON_PUBLISH=true
+    - os: osx
+      compiler: clang
+      env: JOBS=8 COVERAGE=true
 
 before_install:
  - export COVERAGE=${COVERAGE:-false}

README.md

@@ -8,7 +8,9 @@ _/      _/    _/_/_/  _/_/_/    _/    _/  _/  _/    _/
                     _/
 ```
 
-[![Build Status](https://secure.travis-ci.org/mapnik/mapnik.png)](http://travis-ci.org/mapnik/mapnik)
+[![Build Status Linux](https://secure.travis-ci.org/mapnik/mapnik.png)](http://travis-ci.org/mapnik/mapnik)
+[![Build status Windows](https://ci.appveyor.com/api/projects/status/hc9l7okdjtucfqqn?svg=true)](https://ci.appveyor.com/project/Mapbox/mapnik)
+[![Coverage Status](https://coveralls.io/repos/mapnik/mapnik/badge.svg?branch=master&service=github)](https://coveralls.io/github/mapnik/mapnik?branch=master)
 
 Mapnik is an open source toolkit for developing mapping applications. At the core is a C++ shared library providing algorithms and patterns for spatial data access and visualization.