Refactored include statments to match the new includepath solution.
Fixed bug in json API.
Merge pull request #23 from InfectedLan/includepath

Includepath