Positions now use Vector2f.
Merge remote-tracking branch 'origin/master'