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 https://github.com/bmampaey/sunpy

Conflicts:
	sunpy/net/vso/__init__.py
Update tox.ini
Fix
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