Added quattroshapes:prepare_all task
Clean up nicely
Merge branch 'master' into production