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

* 'master' of https://github.com/mathiasbynens/dotfiles: (27 commits)
  .aliases: Add `afk` to lock the screen
  .osx: Don’t `kill` Dashboard
  .osx: Remove broken three-finger swipe commands
  .osx: Add SSD-specific tweaks
  README: Update link to Lauri Ranta’s resources
  .osx: Don’t prompt when quitting iTerm
  .aliases: Lowercase `projects` dir
  .osx: Rename computer name
  init: Install Sublime Text settings
  init: Add iTerm colors
  .osx: Minimize windows into their application’s icon
  Make `.cask` executable
  .aliases: Improve `ips`
  .osx: Suppress error messages when running `~/.osx` twice
  .osx: Stop iTunes from responding to the keyboard media keys
  .osx: Disable automatic spell checking in Mail.app
  .osx: Disable inline attachments in Mail
  .osx: Make coding style more consistent
  .osx: Remove old iTunes commands
  .osx: Add threaded email display settings for Mail.app
  ...

Conflicts:
	.aliases
	.brew
	.osx