Bring piston-api up to current master

Conflicts:

	.gitignore
	urls.py

urls.py

@@ -1,13 +1,11 @@
 from django.conf.urls.defaults import *
 from django.contrib import admin
 from django.contrib.auth.views import login
-import django_cron
 import settings
 
 from registration.views import register
 from registration.forms import RegistrationFormUniqueEmail
 
-django_cron.autodiscover()
 admin.autodiscover()
 
 urlpatterns = patterns('',
@@ -17,6 +15,7 @@ urlpatterns = patterns('',
     ('', include('sso.urls')),
     (r'^eveapi/', include('eve_proxy.urls')),
     (r'^api/', include('api.urls')),
+    (r'^hr/', include('hr.urls')),
 )
 
 urlpatterns += patterns('',