Put back CF and PaaS intro, fix list indentation