rc-el-get fix
Merge branch 'master' into upstream-merging
customize prelude-module
prelude-modules change
fix for upstream merge