comment-out line endings thing
Merge branch 'master' of https://github.com/mrmartineau/dotfiles

* 'master' of https://github.com/mrmartineau/dotfiles:
  update prompt