Move some math calculations to Obj-C (really C macros) and force primitive types for constants.
Merge branch 'master' into shawn

Conflicts:
	Swif/CGGeometry+Swif.swift
.
Merge remote-tracking branch 'origin/shawn' into shawn
collision optimization