Formatting changes.
Merge branch 'base'

Conflicts:
	src/ran.cc