More association fixing
Merge branch 'master' of github.com:ZeusWPI/hydra