Wrapping up #27

Changes all the include to now use content from the wiki.