Merge commit 'dkg/master'

Conflicts:

	website/doc.mdwn
	website/templates/nav.mdwn

diff --cc src/monkeysphere-server
Simple merge

diff --cc website/community.mdwn
Simple merge

diff --cc website/doc.mdwn
index 0b65aed32821ad767a78b2c5fadd7265d4f4e50d,e3f8854ccb03ee643d1e05ba57cc81e68bbdcfb9..634afd958170bb77e5545fe14493566d2859b9dd
--- 1/website/doc.mdwn
--- 2/website/doc.mdwn
+++ b/website/doc.mdwn
@@@ -1,7 -1,6 +1,7 @@@
  [[!template id="nav"]]
  [[meta title="Documentation"]]
- # Dependencies #
 +
+ ## Dependencies ##
  
  Monkeysphere relies on:
  

diff --cc website/download.mdwn
index b848e2a66597132d68c50c3911a9ec55177d9076,b64711dde7e5df2627700738577359d4654c7bc5..69048c932e4c4ccb2e609b89a75f6af8572c93ca
--- 1/website/download.mdwn
--- 2/website/download.mdwn
+++ b/website/download.mdwn
@@@ -20,10 -20,10 +20,10 @@@ configuration](http://cmrg.fifthhorsema
  "Instructions for adding dkg's key to apt")
  
  Once you've installed the packages, you might want to read up on how
 -to get started [as a regular user](/getting-started-user) or [as a
 +to get started [as a regular user](/getting-started-user), or [as a
  systems administrator](/getting-started-admin).
  
- ### Enhancements ###
+ ## Enhancements ##
  
  As of 2008-08-22, If you run debian lenny you're very close to being
  able to run a fully monkeysphere-enabled system.  One gap in the