Merge branch 'master' of git@github.com:leah/django-elsewhere

Author: Chris Drackett

README.markdown

@@ -1,15 +1,15 @@
 from django.contrib import admin
 
-from elsewhere.models import *
+from models import *
 
 class ProfileAdmin(admin.ModelAdmin):
     raw_id_fields = ['user']
 
 class SocialNetworkProfileAdmin(ProfileAdmin):
-    list_display = ('user', 'network', 'username') #, 'date_added')
+    list_display = ('user', 'network_id', 'username') #, 'date_added')
 
 class InstantMessengerProfileAdmin(ProfileAdmin):
-    list_display = ('user', 'network', 'username') #, 'date_added')
+    list_display = ('user', 'network_id', 'username') #, 'date_added')
 
 class WebsiteProfileAdmin(ProfileAdmin):
     list_display = ('user', 'name', 'url') #, 'date_added')

__init__.py renamed to elsewhere/__init__.py

@@ -437,4 +437,4 @@
         'icon': 'yahoo.png',
         'network_type': 'im'
     },
-]
+]