Fixing a bug that was causing associated records to be added, then removed erroneously
Merge branch 'master' of github.com:camertron/avoidance