Fixed year pattern.

Year was matching any digit, one or more times. This could lead to way
too eager matching.

Match years as either a group of 2, or a group of 4 digits.
Merge pull request #308 from cnf/yearfix

Fixed year pattern.