Preparing for fancy word2vec.
Tweaks to word2vec
Merge branch 'word2vec'