Begin adding associate() and related exception
Finish associate()
Merge master into feature/flight-pass-sync and resolve conflicts
Merge pull request #10 from collinday/feature/flight-pass-sync

Feature/flight pass sync