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

Mura ORM work
Adding getPrimaryKeyColumn()
Removing un-needed script
Added support for numeric, better error messages.
Merge pull request #1308 from cameroncf/orm-work

dbutil work
Adding node level locking
Merge branch 'develop' of github.com:blueriver/MuraCMS into develop
Merge branch 'develop' into relatedcontent