Add /masterfiles and /core/tests to include directories.  Remove /masterfiles/lib
Merge pull request #51 from tzz/add-more-include-directories

Add /masterfiles and /core/tests to include directories.  Remove /masterfiles/lib