Updates from CI3 development and addition of user guide

The most recent additions from CI3 development and also adding the user
guide with a html build.