Added armasm, quiteted pylint, and changed gitconfig merge settings.