Added surround and spf13 php to bundles. Cleaning