pull in changes from https://ryanbrooks.co.uk/posts/2013-06-10-setting-up-os-x-mountain-lion/
pull in changes from https://ryanbrooks.co.uk/posts/2013-06-10-setting-up-os-x-mountain-lion/

spikeheap/dotfiles,spikeheap/dotfiles