Reconciling for merge from master on Rakefile

Should make #503 easier with this merge. Takes care of the conflict in the samples section of the Rakefile.

cc/ @wasnotrice