Clean up cgmath stuff
Merge pull request #222 from bjz/cgmath

Clean up cgmath stuff