Add php5+IMAP to addppa.sh
Change bedrock.sh
Reduce manifest/init.pp