Move to no-js instead of noscript
Merge pull request #2020 from darkwing/nojs-swap-2

Move to no-js instead of noscript