Merge branch 'master' of https://github.com/bbatsov/prelude

Conflicts:
	.gitignore
	modules/prelude-web.el
	sample/prelude-modules.el