merged with dotfiles in retina macbook pro