More aliases, fixed some bugs
Merge branch 'master' of github.com:ZachDischner/zachrc