Merge pull request #300 from aaronesilvers/master

Colons
Global technical edits on consistent use of id vs ID