Configurable QueryTablesAPI to call directly postgresql using cartodb-psql
or to keep using a request to the SQL API
Merge branch 'master' into CDB-3686
Upgrades cartodb-psql dependency
Stubs next version
Merge branch 'master' into CDB-3686

Conflicts:
	package.json
Formats NEWS
Updates news
Merge pull request #204 from CartoDB/CDB-3686

Configurable QueryTablesAPI to call directly postgresql
Removes mapnik dependency as it now relies on Windshaft to check mapnik version
Adds windshaft's mapnik dependency to npm-shrinkwrap.json
Merge branch 'remove-mapnik-dependency'

Conflicts:
	NEWS.md
Upgrades dependencies
Merge pull request #206 from CartoDB/upgrade-dependencies

Upgrades dependencies
Upgrades windshaft
Defaults mapnik version for test
Updates news
Merge pull request #207 from CartoDB/upgrade-windshaft

Upgrade windshaft
Release 1.16.0
Merge tag '1.16.0' into cdb