Add git reset to update_dotfiles

This should ensure that git pull always succeeds without merge conflicts