Added in my aliases and some settings
Added in my aliases and some settings
Merge origin changes with mysettings so can push