Associations Refactor
Merge pull request #50 from mattbeedle/associations-refactor

Associations Refactor