Minor updates
Merge branch 'el-get'

Conflicts:
	custom.el
Minor evolution
Minor ignorance
Merge branch 'master' into origin-el-get