changed default parameters
Merge branch 'master' of github.com:dpfried/neural_language_model

Conflicts:
	admm_trainer.py
	relational_admm_trainer.py