Add an acknowledgements section
all hail the SSW overlords
Merge branch 'master' of github.com:sunpy/sunpy-0.4-paper

Conflicts:
	3-2-HEK.tex
Merge pull request #94 from Cadair/master

Add an acknowledgements section
Merge remote-tracking branch 'upstream/master'