Attempted javascript assets fix
Resolved .gitignore conflicts