Merge branch 'develop' into add-spatial-markov

src/pg/test/expected/01_install_test.out

@@ -1,6 +1,5 @@
 -- Install dependencies
 CREATE EXTENSION plpythonu;
 CREATE EXTENSION postgis;
-CREATE EXTENSION cartodb;
 -- Install the extension
 CREATE EXTENSION crankshaft VERSION 'dev';

src/pg/test/expected/05_kmeans_test.out

@@ -0,0 +1,10 @@
+\pset format unaligned
+\set ECHO all
+SELECT count(DISTINCT cluster_no) as clusters from cdb_crankshaft.cdb_kmeans('select * from ppoints', 2);
+clusters
+2
+(1 row)
+SELECT count(*) clusters from (select  cdb_crankshaft.CDB_WeightedMean(the_geom, value::NUMERIC), code from ppoints group by code) p;
+clusters
+52
+(1 row)

src/pg/test/expected/08_interpolation_test.out

@@ -0,0 +1,5 @@
+SET client_min_messages TO WARNING;
+\set ECHO none
+cdb_spatialinterpolation
+t
+(1 row)