modify nsactivityoptions declaration so it builds on lion
Revert "fix window cycling between plots and main window via shortcut key"

This reverts commit a7b564b094bdfa0f09bce3061d2dee6aaa892b3e.

This change broke some keyboard shortcuts (e.g. Undo)
fix window cycling via shortcut key on Mac desktop

This reverts a fix originally intended to prevent a bug on the Mac
desktop wherein unrecognized shortcuts weren't correctly ignored. Now
that the Mac desktop app is wrapped in Cocoa, we don't need this
workaround; it has the side effect of causing us to eat events
associated with system shortcut keys modified with Cmd.
Merge remote-tracking branch: upstream/master