new changes to data files
Lots of changes to main script to handle tokenization better
Merge branch 'master' of git://github.com/usc-isi-i2/dig-deobfuscation