Merge unneeded branch

Not sure why this was branched. Merging newer (and proper) content.