Post-rebase cleanup
.gitignore updated
Atom config updated