More rebounding
Merge branch 'master' of github.com:tsmithe/adaptive-boids

Conflicts:
	boids.py
Typo when removing the scaling for the collision_acc
Small tweaks
Merge branch 'master' of github.com:tsmithe/adaptive-boids
Finish merge