Switch .cap to .rake and update comments
Merge branch 'master' into bootstrap