Merge remote-tracking branch 'origin/master'

.idea/inspectionProfiles/profiles_settings.xml

@@ -1,7 +1,7 @@
 <component name="InspectionProjectProfileManager">
   <settings>
-    <option name="PROJECT_PROFILE" value="Project Default" />
-    <option name="USE_PROJECT_PROFILE" value="true" />
+    <option name="PROJECT_PROFILE" />
+    <option name="USE_PROJECT_PROFILE" value="false" />
     <version value="1.0" />
   </settings>
 </component>

README.md

@@ -1,5 +1,6 @@
-allianceauth
+Alliance Auth
 ============
+
 Alliance service auth to help large scale alliances manage services.
 Built for "The 99 Percent" open for anyone to use
 

requirements.txt

@@ -1,9 +1,10 @@
 # Python Stuff # - see bootstrap.sh
 mysql-python
-
+evelink
 dnspython
 passlib
 xmpppy==0.5.0rc1
+python-openfire-0.2.3-beta
 
 # Django Stuff #
 django==1.6.1