a new fix
bla
Merge commit 'pull/upstream/136' into pr136
fix for the allowed_values. Moved logger.Info to logger.debug. General except removed for testing.
back to the old mc
Merge commit 'refs/pull/upstream/136' into pr136

Conflicts:
	tardis/io/config_validator.py
new line break style
Merge pull request #3 from mklauser/pr136

Pr136