Sync up some settings from the fabric8 distro and a few tweaks here and there