Support for JSON based webfinger

view/templates/xrd_diaspora.tpl

@@ -1,4 +0,0 @@
-
-	<Link rel="http://joindiaspora.com/seed_location" type="text/html" href="{{$baseurl}}/" />
-	<Link rel="http://joindiaspora.com/guid" type="text/html" href="{{$dspr_guid}}" />
-	<Link rel="diaspora-public-key" type="RSA" href="{{$dspr_key}}" />

view/templates/xrd_host.tpl

@@ -4,7 +4,8 @@
  
     <hm:Host>{{$zhost}}</hm:Host>
  
-    <Link rel='lrdd' type='application/xrd+xml' template='{{$domain}}/xrd/?uri={uri}' />
+    <Link rel='lrdd' type='application/xrd+xml' template='{{$domain}}/xrd?uri={uri}' />
+    <Link rel='lrdd' type='application/json' template='{{$domain}}/.well-known/webfinger?resource={uri}' />
     <Link rel='acct-mgmt' href='{{$domain}}/amcd' />
     <Link rel='http://services.mozilla.com/amcd/0.1' href='{{$domain}}/amcd' />
 	<Link rel="http://oexchange.org/spec/0.8/rel/resident-target" type="application/xrd+xml" 

view/templates/xrd_person.tpl

@@ -1,4 +1,3 @@
-
 <?xml version="1.0" encoding="UTF-8"?>
 <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0"> 
 	<Subject>{{$accturi}}</Subject>
@@ -21,7 +20,9 @@
     <Link rel="http://webfinger.net/rel/avatar"
           type="image/jpeg"
           href="{{$photo}}" />
-	{{$dspr}}
+    <Link rel="http://joindiaspora.com/seed_location"
+          type="text/html"
+          href="{{$baseurl}}/" />
     <Link rel="salmon" 
           href="{{$salmon}}" />
     <Link rel="http://salmon-protocol.org/ns/salmon-replies" 
@@ -32,9 +33,4 @@
           template="{{$subscribe}}" />
     <Link rel="magic-public-key" 
           href="{{$modexp}}" />
- 
-	<Property xmlns:mk="http://salmon-protocol.org/ns/magic-key"
-          type="http://salmon-protocol.org/ns/magic-key"
-          mk:key_id="1">{{$bigkey}}</Property>
-
 </XRD>