updated MCP mappings in armor project, and switched forge version in build script to match master