Fix ppains
Merge branch 'master' of github.com:merlinthered/fish-functions