Merge pull request #14 from nickpassarella/master

Added account model and brought back user tests (commented out for now)
Merge branch 'master' of https://github.com/lunchpad/lunchpad.us into upstream_merge
pulling from upstream