Update notes for submitted changes

* Add doc/Makefile to help with building docs
Update notes for submitted changes

* Resync doc/source/conf.py from heat for consistency