#155, #224.  Project tracker and keyfile error fix.
Merge pull request #231 from Bowman74/master

Closes #155, Closes #224.  Project tracker and keyfile error fix.