orphan may only be added when not used in edge def
refactored orphan treatment for guacamole belongings
fixed merge conflicts
jslint
made make