Fix ignroing rules
Add some fish functions
Merge branch 'master' of https://github.com/twealm/dotfiles