MarionL - refactored user code.

Refactored user code for several reasons.

1. Corrected naming convention issue.
2. Duplicate classes (DAOSingleton was a copy of
SessionFactorySingleton).
3. Duplicate config (MyConfig.xml, User.xml were dups of
mybatis-local-config.xml and user.xml respectively) that were located in
incorrect place.
4. Copied the user queries down into user.xml prior to deleting the dup
file User.xml.

Modified unit test to adhere to refactored code.
Modified unit test to use "cyclops" as a user, which was added to the
data export so that all team member's data models should contain said
user.