Ignore Git conflict .orig cruft.
Merge branch 'master' of github.com:rosstimson/dotfiles