change atom settings, add gitattributes for imagediff
add alias function for atom and sublime
Merge branch 'master' of https://github.com/rosenstrauch/dotfiles

* 'master' of https://github.com/rosenstrauch/dotfiles:
  add gitinfo to prompt
  add another prompt style