* upstream/next: (41 commits)
  vcs icons: fixing branch spacing and remote icon in fontawesome
  same deal for the "FAIL_ICON"!
  fixing the "OK_ICON" in 'awesome-fontconfig' which somehow got broken
  Change powerlevel9k_init to prompt_powerlevel_setup
  Fix MacOS specific battery segment logic.
  Minor fix-up to the README.
  Adding license note about the new logo.
  more typos
  Adding the new logo to the README!
  fixed typo fixed issue with POWERLEVEL9K_PUBLIC_IP_NONE being empty .. i hope
  fixed typo
  reverted testing value to default value
  added link to segemnt documenation in README
  fixed issue with POWERLEVEL9K_PUBLIC_IP_NONE being empty for real
  fixed issue with POWERLEVEL9K_PUBLIC_IP_NONE being empty
  added README section for public_ip segment
  added the ability to specify and only attempt a particular method
  Add Changelog for v0.5.0
  added configurable string when there is no IP
  updated some comments changed some offline behavior
  ...

…nerdfont

* 'next' of https://github.com/bhilburn/powerlevel9k:
  CHANGELOG: Updating to reflect work on `next`
  README: fixing name of `detect-virt` to `detect_virt`
  README: default segment list was no longer accurate
  updating changelog for segment name change `disk_usage`
  incorportaing feedback from review on `hdd_usage` segment
  Fix swift segment
  Updating the readme wih `hdd_usage` details.
  changing `hdd_usage` to actually show usage
  Moving `HDD_ICON` definition to consistent spot.
  Fix
  Fix
  Fix
  Fix
  Fix
  Fix
  Change colors
  Add anion155's HDD segment