typo fix
Merge branch 'draft2' of github.com:ehsteve/sunpy-0.4-paper into draft2

Conflicts:
	3-5-Database.tex