Update sunpy/__init__.py

updated version number
10^-24m are 1ym, not 1zm. Thanks to @dpshelio for finding that bug
Merge pull request #545 from derdon/extract_waveunit_fix

fix for extract_waveunit
Merge remote-tracking branch 'origin/0.3'
Merge branch 'stable'

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

master?
Merge branch 'master' of github.com:sunpy/sunpy
Update Travis yml for old branches
Merge branch 'stable'
Callisto: Remove assumption about max gap between files.

Closes #543
Merge pull request #558 from segfaulthunter/callistofix

Callisto: Remove assumption about max gap between files.
Merge branch 'master' into deps