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
broken but adding pyana
Merge remote-tracking branch 'rhewett/namespace_cleanup' into sun_ana

Conflicts:
	sunpy/io/__init__.py
Made ANA work again, not sure if the style is the same as the new name space
methods.
Minor change, to get import sunpy.io.ana to show
Minor Change
Started the clean up of documentation for ana.
Merge remote-tracking branch 'upstream/staging' into sun_ana
Who knows? Time to doc this shit up.
Fixes issue #416: Helioviwer tests should not break on server error.
added split function in time.timerange
fixed time.timerange.split to return timeranges and fixed its desc
fixed time.timerange desc
fixed spelling error
give time.timerange.split a default n value