Prevent user-disabled objects from appearing#1688

pjrobertson merged 3 commits intomasterquicksilver/Quicksilver:masterfrom

omittedquicksilver/Quicksilver:omittedCopy head branch name to clipboard