Synced with upstream
Merge branch 'master' of github.com:sunpy/sunpy
Merge branch 'master' of github.com:sunpy/sunpy
Merge branch 'staging' of github.com:sunpy/sunpy
Update sunpy/__init__.py

updated version number
Merge branch 'master' of github.com:sunpy/sunpy
Merge branch 'master' of github.com:sunpy/sunpy
Merge branch 'master' of github.com:sunpy/sunpy
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'
Merge branch 'master' of github.com:sunpy/sunpy
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.
Patch to close #529.

Subclassed the download method in GOES lightcurve to specify a custom filename
from the uri which is then passed to LigtCurves download.

Added the ability to specifiy custom filename to LightCurve._download