Merge in files that have been adjusted for the newest version. #272

Closed thevisad closed 10 years ago