Cleanup some cruft that crept in here...
Merge pull request #2 from rterbush/fixups

Closed with merge --fix pattern in install_generator.rb