Do a git pull before push.

Also, do not force push.

Implements what was discussed in #1396.
Merge pull request #1401 from getnikola/pull-before-push

Do a git pull before push.