Merge remote-tracking branch 'origin/master'

Conflicts:
	python/path/traversal.py
clean up
clean up
clean up
update .gitignore
update gitignore