checkpoint of rake task to prepare for pairs with Matt
Merge remote-tracking branch 'origin/master'