Changed the Or's to And's when talking about assigning perport, decport, and NA
Merge branch 'master' of https://github.com/kaycole/fish_shift