update safe-local-variables.
Merge branch 'master' of github.com:laynor/emacs-conf

Conflicts:
	custom.el
ad mac profile and module
update mac.
Merge branch 'master' of github.com:laynor/emacs-conf