Merge pull request #3 from mklauser/pr136

Pr136
adding linspace directly into the reader
Merge pull request #4 from mklauser/pr136

Pr136
Merge branch 'config/using_definition_parser' of github.com:wkerzendorf/tardis into config/using_definition_parser
added exponential and power_law to the definition file
Merge commit 'refs/pull/upstream/136' into pr136

Conflicts:
	tardis/data/tardis_config_definition.yml