Pyinit
Merge branch 'py' into pyvers

Conflicts:
	.gitignore