Merging recent changes into my personal site

Self-explanatory.