using grunt-ts@1.11.6 to use the latest version of typescript
removed extra line added by accident
Merge branch 'master' into typescript-impatient

Conflicts:
	plottable.js
	test/tests.js
Merge pull request #764 from palantir/typescript-impatient

using grunt-ts@1.11.6 to use the latest version of typescript
Merge branch 'master' into 604-numeric-axis-width

Conflicts:
	plottable.d.ts
	plottable.js
	test/tests.js