Add engine to p'json, clean up a little
.
Merge pull request #2 from CTownsdin/devBranch

Dev branch