The openstack doc standard location is 'user', so go with that.
Incorporate pages from the shade and occ docs into the appropriate
places in the user index file.
This still leaves user/logging and user/guide/logging which need to be
rationalized. That will come in the next commit, as it also needs to
actually rationalize the logging helper functions.
Remove the Makefile, as it's not used by things.
Change-Id: I26f36370ef9651f4bcaa7dee3b903309463d9592
40d425c595