merge dfm branch
Merge branch 'master' of github.com:slayer/dotfiles