first pass
Merge pull request #2 from sqwiggle/feature/git_highlighting

Feature/git highlighting