Added django-tastypie to list of dependencies
Added initial migration for userprofile.
Added tastypie to installed apps; made some minor code cleanup.
Removed snippet that was breaking things
Merge remote-tracking branch 'origin/master'

Conflicts:
	xapps/userprofile/models.py