Merge branch 'master' of /usr/local/git/ucc-site

diff --combined index.mdwn
index 74ed80f,ac9e5c8..ce1514a
--- 1/index.mdwn
--- 2/index.mdwn
+++ b/index.mdwn
@@@ -1,7 -1,5 +1,7 @@@
  Welcome to your new wiki.
  
 +Setup almost complete,leaving the below as a quick reference for now.
 +--
  Some bits of information:
  
  * Raw site files are currently in /services/http-iki/
@@@ -21,6 -19,7 +21,7 @@@ To set up RCS (*mostly done now, woo*)
  * I've done pretty much all of the above now.
  * CGI commits have issues, probably related to group permissions. Trying again.
  * That worked, so now I'm going to try a git push.
+ * THAT worked, so I'm happy!
  
  All wikis are supposed to have a [[SandBox]], so this one does too.