Merge pull request #1 from lexevs/master

adding directories that didn't make it through the migration from svn to github
Merge pull request #2 from lexevs/master

Merge LexEVS fork.