Merge joshterrell.com & BaseSite

the 404 page is up :D
I'll continue with separate commits from here.