Everything expressed in standard Cartesian co-ordinates now.

This means x axis goes right, y axis goes up and angles
are measured anti-clockwise from x-axis.
Fixed velocity addition... at last!