"random tweaks"
added "prelude-modules.el" to repo
Merge branch 'master' of https://github.com/matejo/prelude

Conflicts:
	prelude-modules.el