Remove commented-out code
Fix broken file inclusion
Bump version and fix email