Cleaned up merge.  Deleted anything not in original swc/boot-camps or in shell/