Velocity stuff
Merge branch 'master' of https://github.com/astrofoley/astr596

Conflicts:
	src/composite.pyc