Merge commit 'jrollins/master'

diff --combined website/download.mdwn
index 5bd2f2aa237bca053629c3e8ab64896c43cc9cb6,3c2f3c54fda59bb0349a312c800e9bcbb9c2afbc..dbae3094f0ad8851a17b1c556e4dcac9b5b1af19
--- 1/website/download.mdwn
--- 2/website/download.mdwn
+++ b/website/download.mdwn
@@@ -28,16 -28,12 +28,16 @@@ The git repo from this web site
  
  [Jameson Graef Rollins](http://cmrg.fifthhorseman.net/wiki/jrollins):
  
-       git clone http://lair.fifthhorseman.net/~jrollins/git/monkeysphere.git monkeysphere
+       git clone git://lair.fifthhorseman.net/~jrollins/monkeysphere monkeysphere
  
  [Daniel Kahn Gillmor](http://cmrg.fifthhorseman.net/wiki/dkg):
  
        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