keep a sample config in the repo
ignore some fixture directories
Merge remote-tracking branch 'origin/master'