combines the rigid fixes and moves the location of the balance of forces fix

[tmweigand]

@ajotcham Take a look at this and make sure it runs for you as well. Once confirmed you can merge this into #5