Vim changes
Fixing merge conflict
Merge branch 'master' of github.com:cmckendry/Configurations

# By Mathias Bynens (15) and others
# Via Carter McKendry (1) and Mathias Bynens (1)
* 'master' of github.com:cmckendry/Configurations: (26 commits)
  .gitconfig: Add comment about `color.ui` in Git ≥ 1.8.4
  .osx: `~/.CFUserTextEncoding` can break several Adobe apps
  .aliases: Add `chromekill` to kill all Chrome tabs to free up memory
  .gitconfig: Remove global remote branch
  bin: Point `subl` to the default ST3 location
  .aliases: Add `-F` to `ls` aliases
  .osx: Disable the sound effects on boot
  .osx: Add GPGMail 2 settings
  .gitconfig: Improve display of astral Unicode symbols in diffs
  .aliases: Add `timer`
  .curlrc: Disguise as IE 9 on Windows 7
  .gitattributes: Disable normalizing line endings globally
  .brew: Install PHP 5.5
  .bash_profile: Remove ‘autocomplete Grunt commands’
  .osx: Add Spotlight settings
  bin: Update `subl` symlink to `Sublime Text 3.app`
  README: Tweak Git-free install command
  .aliases: Make Grunt print stack traces by default
  bootstrap.sh: Avoid `source` if there are no changes
  Remove GPL license
  ...