ignore python droppings
mostly stub methods
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore