fixes #67 - Everything appears to be working once I looked at the files which are being modified in past commits and migrated those over as well.  Eventually this upgrade process should be scripted.