use config file for params
more configurable options in config for running without params
gitignore
Merge branch 'master' into github

* master:
  gitignore
  more configurable options in config for running without params
  use config file for params