Improved Rakefile; added changelog
Merge pull request #3101 from nhr/updates

Improved Rakefile; added changelog