Highlighted rows now inverted color on hover
Added TODO, removed trailing whitespace.
Fixes issue #8
Resolved conflict between branches