macro cleanup
move C-f to magit-gitflow-mode keymap
move menu definition to the beginning

to match the next branch