Merge branch '7015-update-user-guide'
authorBryan Cosca <bcosc@curoverse.com>
Wed, 21 Oct 2015 15:36:25 +0000 (11:36 -0400)
committerBryan Cosca <bcosc@curoverse.com>
Wed, 21 Oct 2015 15:36:25 +0000 (11:36 -0400)
closes #7015


Trivial merge