Merge pull request #1 from lexevs/master

Merge NCIP with LexEVS fork.
Merge branch 'master' of github.com:NCIP/lexevs
Merge pull request #2 from lexevs/master

Latest lexevs branch merge.
Merge branch 'master' of github.com:NCIP/lexevs