ignore empty cmd value
clean up code around conflict_cmd
Merge pull request #312 from zhuochun/bug-263-can-add-blank-hotkey

Fix #263 can add blank hotkey