Updated build instructions.

Conflicts:
	doc/building.rst