Merge branch 'master' of /Users/jrylander/dotfiles with conflicts.