Update basic dotfiles aliases. Change git aliases. Restructure basic plist files
Merge branch 'mac'

Fast forward master based on mac branch. Update git commands and aliases