Merge pull request #1 from r3dunlop/dev

TGriffin clean up
cleaned up a couple of lines in griffin
fixed TGriffin merge conflicts
Merge pull request #107 from r3dunlop/master

Cleaned up merge conflicts from last night