Travis tweak
Merge branch 'staging' of github.com:sunpy/sunpy into staging
Updated distribute_setup.py to version 0.6.45
Merge pull request #476 from ayshih/distribute

Updated distribute_setup.py
Merge branch 'staging' of github.com:sunpy/sunpy into staging