Merge joshterrell.com & BaseSite

(rebase me)