Prposed patch to allow specifying the site keyword in vso_get
Added information about the site keyword into the docstring of the function get()
Merge branch 'namespace_cleanup' of https://github.com/rhewett/sunpy
Merge https://github.com/bmampaey/sunpy

Conflicts:
	sunpy/net/vso/__init__.py
Update tox.ini
Fix
local testing
Add stereo cor colour maps from IDL. Not tested yet.
Tested COR1 and COR2
Merge remote-tracking branch 'upstream/master' into staging
Fixes issue #416: Helioviwer tests should not break on server error.
Merge pull request #414 from segfaulthunter/vsostuff

merged vso changes
Merge pull request #420 from sunpy/staging

Update master from staging.
Merge pull request #422 from sunpy/master

staging / master sync
Merge branch 'master' of https://github.com/sunpy/sunpy
Merge remote-tracking branch 'upstream/staging'
Small test fix
more test fixes; removed lightcurve plotting
Merge branch 'staging' of https://github.com/Cadair/sunpy into staging
travis WHYYY