Merge pull request #240 from mtwebster/dummy

Actions:  Add more display options: NotNone, and numeric value
Merge pull request #255 from mtwebster/inactive-selection

When using panes, don't reset the selection each time the inactive pane is made active again.
Add option to swap the Trash and Delete keybindings (allow direct
deletion with Delete key only)

Also update potfile