Update from dev branch

@matthesrieke @bpross-52n @ahitch We've not updated the website master in a looong time. Anybody against this merge? It's mostly content updates.