Fix highlighting behavior and reorganize how selection and highlighting iteract
Merge pull request #166 from taiyangc/highlight

Fix highlighting behavior and reorganize how selection and highlighting ...