android
Merge branch 'master' of https://github.com/mathiasbynens/dotfiles

* 'master' of https://github.com/mathiasbynens/dotfiles:
  .functions: Make `gz` more awesome
  .aliases: Add `map`
  .bash_prompt: Fix `parse_git_dirty` for Git v1.8.0+
  .gitconfig: Set `push.default = simple`
  bin: Update to Bash 4.2.39
Merge branch 'master' of https://github.com/mathiasbynens/dotfiles

* 'master' of https://github.com/mathiasbynens/dotfiles:
  .osx: Show item info to the right of the icons on the desktop
  .aliases: Lowercase `com.apple.finder`
correct git email
customiz
Merge branch 'master' of https://github.com/mathiasbynens/dotfiles

* 'master' of https://github.com/mathiasbynens/dotfiles:
  bin: Update to Bash 4.2.42
  README: Update Lauri Ranta’s hidden preferences URL
  .osx: Clarify that the iTunes settings are for pre-iTunes 11 only
  .osx: Document the various values for Hot Corners settings
  .osx: Remove the iTunes Ping settings
  .bash_profile: Move the `LANG` & `LC_ALL` exports into `.exports`
  .functions: Add `calc`
brew fix
changes in path
Merge branch 'master' of https://github.com/mathiasbynens/dotfiles

* 'master' of https://github.com/mathiasbynens/dotfiles:
  .osx: Fix typo
Merge branch 'master' of https://github.com/boennemann/dotfiles

* 'master' of https://github.com/boennemann/dotfiles: (203 commits)
  add aliases
  .aliases: Remove the now-broken `whois` alias
  .vimrc: Avoid creating backups when editing files in `/tmp`
  add latest node
  .bash_prompt: Interpret escape sequences correctly in all cases
  .bash_prompt: Add back escape sequences
  .bash_prompt: Avoid double-escaping ANSI codes
  Add `.editorconfig`
  .gitconfig: Add default Git `push.default` config
  init: Use the Solarized Dark theme in Sublime Text
  .gitconfig: Tweak `diff` colors
  .gitconfig: Remove `push.default`
  Enable Solarized Dark theme in Vim
  Update Bash prompt to match the Solarized theme
  .bash_profile: Enable Bash completion if `/etc/bash_completion` exists too
  Brewfile: Install a more recent version of `screen`
  .osx: Disable the Launchpad gesture
  .screenrc: Add some more settings
  .osx: Only install custom Terminal profile once
  .osx: Add (commented-out) instructions on how to set the wallpaper
  ...

Conflicts:
	.extra
	.gitconfig
	.path
David's personalisation