commit post-submission
paper final version
Merge branch 'master' of https://github.com/harperj/d3annot

Conflicts:
	display.html
	lib/ng-table.css
	lib/ng-table.js
	manifest.json
	src/injected.coffee
	src/main_content.coffee