Add file to indicate "safe" branch
Clean up top level
Merge branch 'master' into safe
Clean up file