Merge pull request #305 from mballance-sf/master

- #(nobug) - Correct a bug involving relative include directives:
Merge pull request #306 from mballance-sf/master

final bug fixes
Update for 1.5.7 release
Updates for Luna and bugfix to support escaped identifiers (#325)