follow up from review
move BasicUser from following module
Merge branch 'restdoc-following' of https://github.com/sathomas/Hilary into restdoc
Merge branch 'restdoc-principals' of https://github.com/sathomas/Hilary into restdoc