enable whitespace-mode in modes derived from text-mode
added contribution guidelines
Merge branch 'master' of https://github.com/bbatsov/prelude

Conflicts:
	personal
	snippets