split up fixup functions and git functions
forgot py extension
forgot an import
added cli tests
Merge remote-tracking branch 'origin/master'