remove extraneous parameter
move picture info to principals module
move picture info from content
Merge branch 'restdoc-content' of https://github.com/sathomas/Hilary into restdoc
Merge branch 'restdoc-principals' of https://github.com/sathomas/Hilary into restdoc