ignoring some files
Merge remote-tracking branch 'upstream/develop' into develop
Primary keys now use column attribute
Now works when name and column attributes are different
Merge pull request #1307 from cameroncf/orm-work

Mura ORM work