Replaced old config with el-get version.
Merge branch 'master' of github.com:tarwich/Settings

Conflicts:
	_emacs