adding in GSOC acknowledgement to the documentation
Merge pull request #837 from wafels/0.4-doc-change-3

adding in GSOC acknowledgement to the documentation
Merge pull request #840 from sunpy/master

merge master into 0.4 2