Version 1.3.1

Fixed problem with marge branches not being diff'ed and fixed syntax highlighting to handle the branches.