refactor syntax definition
nested blocks baby
Merge branch 'rubyfication'

Conflicts:
	Gemfile
	Gemfile.lock