Annoying vi
Merge branch 'master' of github.com:ripperdoc/raconteur

Conflicts:
	resource.py