Brian collision fork

I'll be more detailed later, but a quick summary:
- master was merged into the branch
- fixes and the addition of Farseer code into the project

There's a few places where it's evident that I just wanted to compile, so this is definitely not fit for merging yet...