Added user model.
more flexible version of rake to work on latest ubuntu
Merge remote-tracking branch 'upstream/master'