Correct Python mode settings and hs-hide-initial-comment-block default.
Add settings for git merge and git push.