Merge pull request #1 from BobPalmer/master

Updating.
Merge pull request #2 from BobPalmer/master

Merging CRP Updates
Adding Karborundum back in.

Seems to have disappeared.
Merge pull request #2 from TMarkos/master

Adding Karborundum back in.
Merge remote-tracking branch 'origin/master' into DEV