Enabling rerere
Enabling patience
Updating iterm2 settings
Adding npm
Add fixopenwith to clean launch services
Clean up aliases
Update zsh syntax highlighting
Removing .gdbinit
Add iOS simulator alias
Remove puff
Adding OS X defaults
Tweaking OS X settings
Move Dock to the right
Don't expect subl to be in the PATH
Merge branch 'master' into fish

Conflicts:
	install.sh