support for the if tag
Merge remote-tracking branch 'steven/master'
merge cleanup
Merge pull request #1 from greenify/master

keep IF keybindings