Mac-only edits
bring 'mac' branch up to date with small changes in master
Mac's can't take the ls --color
Edits to vim so no error messages, new color scheme!
Update .gitignore to mirror mac branch