getting ready to rebase before I work. This will probably require a manual merge since I had some prilimary bibliography stuff.
merged