Simple subtree merge tool
Add some homebrew related paths if we have it installed
Allow an install location other then ~, useful when bundling up dotfiles for distribution to a machine without git
New laptop, better hostname
Should be able to detect PHP5 source dir before configure has been run