git gutter seems pretty slick
disable highlight or paren matching region
merging changes from home and work