Removed hacks for testing. Integrated user model with controller. Fixed a few errant field names.