Upgrades windshaft
Changes to windshaft tagged version
Re-generate npm-shrinkwrap.json
Make windshaft version visible in news
Merge pull request #234 from CartoDB/upgrade-windshaft

Upgrade windshaft
Release 1.21.1
Stubs next version
Merge branch 'master' into static-controllers

Conflicts:
	npm-shrinkwrap.json
	package.json