Refactoring and bug fixes

* Fix parsing of comments which contain extra lines that might look like
    unified lines.
* Fix a couple test case expected results
* Refactored names of regex
* Refactored and bug fix on svn/cvs version number matching