slug irc
update
Merge branch 'master' of github.com:binaryphile/dotfiles
move config.fish to template
Merge