Site cleanup

Still work to do, but this is what I could get done today. Thoughts, @desmondcain ?