Add new test data files. Small updates to the project builder to enable
incremental builds
Merge remote-tracking branch 'upstream/master'
Merge pull request #311 from mballance-sf/master

Test updates