Update sunpy/__init__.py

updated version number
Merge branch 'stable'

Conflicts:
	sunpy/__init__.py