Highlighting filename finished.  Still need to implement removing file highlighting
Merge remote-tracking branch 'Databox/master'