simply travis now that we're on node-mapnik binaries
Drop unused assets
Merge branch 'master' into cm4