Changed link in prepartion to move site
Merge branch 'master' of github.com:jiko/jiko.github.com
More cleanup.