Upgrades dependencies except express
Merge branch 'master' into upgrade-dependencies

Conflicts:
	app/models/psql.js
	npm-shrinkwrap.json
	package.json
Updates news
Uses https endpoints for dependencies
Merge pull request #171 from CartoDB/upgrade-dependencies

Upgrade dependencies