getting ready to rebase before I work. This will probably require a manu...

...al merge since I had some prilimary bibliography stuff.