Changed 'id' to be 'user_id' due to Django Model compatibility issues
Merge pull request #2 from rememerme/greggjs

Changed 'id' to be 'user_id' due to Django Model compatibility issues