using yaml config
fixed merge conflicts
changed config
Merge pull request #8 from cgoldberg/config-file

using yaml config