wip
merging
Merge branch 'master' of github.com:edwindj/validate
Merge branch 'master' of github.com:edwindj/validate
Merge branch 'master' of github.com:edwindj/validate
adding tests for setting name on expressions in files
fixed tests
added extra test
Merge branch 'master' of github.com:edwindj/validate
Merge branch 'master' into files