Merge pull request #1 from nijel/master

Update from upstream
Reword push documentation
Merge pull request #487 from justhamade/master

Update docs