Merge branch 'interpreter-api' into dev

Conflicts:
	jedi/__init__.py
	test/test_regression.py

See: #145

docs/conf.py

@@ -266,6 +266,7 @@ todo_include_todos = False
 
 # -- Options for autodoc module ------------------------------------------------
 
+autoclass_content = 'both'
 autodoc_member_order = 'bysource'
 autodoc_default_flags = []
 #autodoc_default_flags = ['members', 'undoc-members']