Added config to gitignore
Added example config
Fixed merge conflict
Some final cleanup
Merge branch 'master' into v2