Converted 404.html to the new style + prepared master/index.html in Bamboo

As well as fixing the very, very lazy copy and pasting mistakes I made.