Reorganize user variables. Adding path settings.
Merge branch 'master' into dev-user-settings

Conflicts:
	config/main.el