no message
Merge branch 'MacDev' of https://github.com/loptimus/.emacs.d into MacDev

Conflicts:
	README.md
no message
Update README.md
Rename base_config to baseConfig
Rename base_config to baseConfig
fix conflict