Update Rakefile
Update _config.yml
Update _config.yml
Merge remote-tracking branch 'upstream/master'