Merge pull request #5 from dan-hill/master

Pull changes into the feature cleanup branch.
fixed too many parameters error in user model
moved user list logic into the model
added some todos
Merge pull request #7 from dan-hill/feature-cleanup-extravaganza

Feature cleanup extravaganza