Improvements to rake tasks - for convenience and site config

for @jamiecobbett or @russellgarner to review