Remove finished items from TODO, add .ssh config to silence warnings
Fix merge conflict in TODO