added back noconflict.js, updated gitignore to ignore test archives