Missed a few copyright years. Removed svn Id keywords.