Merge remote-tracking branch 'upstream/refactor' into refactor

Conflicts:
	gv.py
	helpers.py
	options.py
	ospy.py
Merge remote-tracking branch 'upstream/refactor' into refactor

Conflicts:
	options.py
Merge remote-tracking branch 'upstream/refactor' into refactor
Merge remote-tracking branch 'upstream/refactor' into refactor
base_url removed.
Merge pull request #26 from teodoryantcheff/refactor

base_url removed