4 more
Merge branch 'upgrade' of github.com:palantir/tslint into upgrade

Conflicts:
	Gruntfile.js