Update default.xml for easier remote merges and reflect the changes made to local_manifest.xml and the README