Merge pull request #519 from dorkster/bugfixes

Don't require restart to update keybind labels
Check if the hero is alive before checking map events