generate docs in conf.py rather than using make
doc tweaks
Merge remote-tracking branch 'upstream/master'

Conflicts:
	refl1d/polymer.py
	setup.py