switched over to using sentence/bullet objects instead of indices

this will let us integrate manual highlights more easily
analysis will now take into account manual highlights
check overlapping sentences before auto-highlighting
Merge branch 'master' into gh-pages