moved more stuff to config file.
Merge pull request #22 from finninde/config

moved more stuff to config file.