Update README.md
Update README.md
Roderik's defauts and additions
Add rbenv
Improvements
Removing some stuff with adverse effects
Improve the .extra file handling
Update readme
Fix
Clean up vimrc
Bash prompt, vim config and the hist alias
More hist tweaks
Merge remote-tracking branch 'mat/master'

* mat/master: (68 commits)
  .osx: Use the Pro theme by default in Terminal.app
  .functions: Attempt to make `server` open the browser *after* the server has started
  .osx: Hide Safari’s bookmarks bar by default
  .osx: Group windows by application in Mission Control
  .osx: Don’t show Dashboard as a Space
  .osx: Set computer name
  .osx: Add more Finder settings for icons on the desktop and in icon views
  .osx: Show icons for hard drives, servers, and removable media on the desktop
  .bash_profile: Source `~/.extra` before the other dotfiles
  .aliases: Make `update` update `npm` and its installed packages as well
  .osx: Add Twitter.app settings
  .osx: Comment out the line that enables the 2D Dock
  .osx: Hide the useless Time Machine and Volume icons
  .aliases: Optimize the `ls` flavor detection even further
  .aliases: Optimize the way we detect the `ls` flavor
  .aliases: Detect which `ls` flavor is in use and use the appropriate flag for colorized output
  .aliases: Support colorized output for `ls` 8.17 only (GNU coreutils)
  .brew: Install PHP 5.4
  .osx: Increase sound quality for Bluetooth headphones/headsets
  .vimrc: Enable per-directory `.vimrc` files
  ...

Conflicts:
	.aliases
	.bash_profile
	.bash_prompt
	.brew
	.osx
	.vimrc
	README.md
Some cleanup
Add a script to remove merged git banches

http://snippets.freerobby.com/post/491644841/remove-merged-branches-in-g
it
Add brew node path
Added Sublime settings
Updated Sublime
New Sublime package
add ssh-add