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

Conflicts:
	ac-comphist.dat
global whitespace mode off