Updated with settings folder and new ignores.
Fixed conflicts.