some packages were missing: very weird, specially projectile
Merge branch 'master' of https://github.com/dojeda/prelude

Conflicts:
	personal/00-packages.el
personal changes to cpp
Merge branch 'master' of https://github.com/dojeda/prelude
removed ESS module