Updated copyright date and the name of the project.
Merge branch 'craig'