Fix for env_keep_add/subtract not showing up in main sudoers

The tests for my change are also there (no tests for the original env_keep_add/subtract feature though).

I've also added couple of fixes to make Rake work, please let me know if you need these to be removed or to be filed as a separate pull request.