Cleaned up things!

Cleaned up collision, Physics bitmasks, and fixed the C Helper thing!
Merge branch 'SarahBranch'