Merge pull request #534 from jwensley2/user_guide

User guide formatting