Updated 404.html, sitemap, and atom feed
Merge branch 'master' of https://github.com/alexjlockwood/alexjlockwood.github.io
Change name of atom.xml