Fix self in blocks
Merge branch 'master' of github.com:alehander42/gagrakacka

Conflicts:
	gagrakacka/gagrakacka.py
	gagrakacka/sobjects.py