updated doc/cheetah.ini and writeConfigurationLog with the current keywords
Merge branch 'jonas' into giraffe
Merge branch 'giraffe' of github.com:antonbarty/cheetah into giraffe