Update sunpy/__init__.py

updated version number
Merge branch 'stable'

Conflicts:
	sunpy/__init__.py
Merge pull request #551 from Cadair/master

master?
Merge branch 'master' of github.com:sunpy/sunpy