Hybrid properties should not be accepted as fields
Remove comment, now stated in issue #175
Fix primary key identification

_primary_key_name was finding the table column name, however it should
find the attribute name of the model
Merge fix-issue-171
Merge remote-tracking branch 'origin/custom-column-names'