single line per sentance
line breaks again
Merge branch 'dps2013' into testing

Conflicts:
	papers/stuart_mumford/sunpy_mumford.rst