I hate answering my own question, but in case someone stumbles here this might help out.
The first article I referenced (part of the git-scm book), is out of date. The best method to do this is to use the git subtree command.
This article explains it it detail. The process is much simpler than using git merge subtree.