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

Conflicts:
	config/main.el
Merge pull request #9 from mvdakker/dev-python-jedi

Add jedi for python completion
Merge branch 'dev-python'
Merge remote-tracking branch 'origin/master'
Use elpy with jedi as backend.