Branch cleanup & modified .gitignore.