more merging
Merge branch 'master' of https://github.com/delianides/dotfiles-local