Merge pull request #1326 from JoelHutton/jh/user_guide_updates

Update user guide