Finalizing association configuration and import from github, fixed a bug resulting in blank foreign keys