checkout master before anything is pulled so that merge can continue
always update with --init
Merge pull request #433 from davecramer/master

checkout master before pull