Update year in Licence.rdoc.
Fix an old, out of date comment.
Merge branch 'next'

* next:
  Fix an old, out of date comment.
  Bump version of rubyzip to 1.1.4.
Update version info and changes file for release.