Made some functions private
Merge remote-tracking branch 'origin/master'

Conflicts:
	star/combine_star_sjout.py
Merged changes to this file.