Change Move Line Up / Down to Move Statement Up / Down
Merge branch 'master' of https://github.com/martinrist/intellij-keymaps