Some user backend
More User Stuff
Fixed Accounts
Removed unnecessary files
fix merge conflict
Merge pull request #2 from luster/joe

Joe
Delete .swp
Delete .models.py.swp