Merge in content from kylehotchkiss.com - needs hand merging for many details still