Merge pull request #52 from pareeohnos/master

Supply options to 'has_many' join
Added documentation for options hash