.osx: Add ExpandedStateFor* variants for OS X 10.9

Closes #361.
.aliases: Use `en0` for `localip`
.osx: Update iOS Simulator symlink
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  .osx: Update iOS Simulator symlink
  .aliases: Use `en0` for `localip`
  .osx: Add ExpandedStateFor* variants for OS X 10.9