Merge commit 'jrollins/master'

diff --cc website/download.mdwn
index 37c82e7030bf8ebafdea3361a53df35387763b44,982f88fb2d8e6accf1823159f6685b022bc4fdb7..5bd2f2aa237bca053629c3e8ab64896c43cc9cb6
--- 1/website/download.mdwn
--- 2/website/download.mdwn
+++ b/website/download.mdwn
@@@ -32,12 -32,8 +32,12 @@@ The git repo from this web site
  
  [Daniel Kahn Gillmor](http://cmrg.fifthhorseman.net/wiki/dkg):
  
-       git clone http://lair.fifthhorseman.net/~dkg/git/monkeysphere.git monkeysphere
+       git clone git://lair.fifthhorseman.net/~dkg/monkeysphere monkeysphere
  
 +[Micah Anderson]
 +      
 +      git clone git://labs.riseup.net/~micah/monkeysphere
 +
  ## Contact ##
  
  Please feel free to contact any of the Monkeysphere developers with