updated belongs-to association to use custome primary keys
update all associations to use custom primary keys
missed a couple things on the custom primary keys