MarionL - fixed a few issues from merge.

Fixed a few issues that occurred after picking up Olufemi's code. He
inadvertently deleted the my xml file from the config. Also corrected
some of the dao class which re-created the singleton session factory.