Added ability to specify token map in Dictionary.from_corpus

In cases where the BOW matrix is given along with an id -> token map,
this feature allow for a perfect reconstruction of the dictionary
object using the from_corpus method.
Use a dictlike structure for id -> token mapping
minor reformat
remove obsolete comment
PR #216: python 3 compatibility fix
Merge branch 'corpus-words' into develop