Put el-get setup in a new file.
Merge branch 'master' of https://github.com/danielappelgren/config

Conflicts:
	init.el
Separate el-get setup file.
readme