Closes #616

Also adds better Mac delete keyboard shortcut support