Add lexicon.
Add user_import
Merge pull request #2 from noels/master

Add user import and lexicon.