Refactor the underlying popover and table view controllers so they are not set to nil when the popover picker disappears
Resolves #7