.aliases: Use `en0` for `localip`
.osx: Update iOS Simulator symlink
Merge branch 'master' of github.com:mathiasbynens/dotfiles into upstream

* 'master' of github.com:mathiasbynens/dotfiles:
  .osx: Update iOS Simulator symlink
  .aliases: Use `en0` for `localip`