Several more doc fixes
Merge branch 'master' of https://github.com/SRL/SRL-6