Update links to Windshaft-CartoDB and CartoDB-SQL-API
fixed contributors in README
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop
Removed Mixpanel events from frontend
Add note about upgrade instructions being in the NEWS.md file
Merge branch 'develop' into feature/new_importer