Merge branch 'master' into interactive_NMT

# Conflicts:
#	model_zoo.py

Author: lvapeab

main.py

@@ -64,7 +64,7 @@ def train_model(params):
 
     # Build model
     if params['RELOAD'] == 0:  # build new model
-        nmt_model = TranslationModel(params, type=params['MODEL_TYPE'], verbose=params['VERBOSE'],
+        nmt_model = TranslationModel(params, model_type=params['MODEL_TYPE'], verbose=params['VERBOSE'],
                                      model_name=params['MODEL_NAME'], vocabularies=dataset.vocabulary,
                                      store_path=params['STORE_PATH'])
         dict2pkl(params, params['STORE_PATH'] + '/config')
@@ -86,7 +86,7 @@ def train_model(params):
 
     else:  # resume from previously trained model
         nmt_model = TranslationModel(params,
-                                     type=params['MODEL_TYPE'],
+                                     model_type=params['MODEL_TYPE'],
                                      verbose=params['VERBOSE'],
                                      model_name=params['MODEL_NAME'],
                                      vocabularies=dataset.vocabulary,