Merge pull request #536 from jwensley2/user_guide

User guide formatting