update from MBA
Merge branch 'master' of github.com:XL64/my-scripts-and-config

Conflicts:
	.emacs.d/init.el