Merge branch 'master' of git://github.com/hooroo/gridinit-jmeter into hooroo-master

Conflicts:
	lib/gridinit-jmeter.rb
	lib/gridinit-jmeter/controllers/if_controller.rb
	lib/gridinit-jmeter/dsl.rb
	lib/gridinit-jmeter/version.rb
pry and ap in dev only
default verbs for helper methods
Merge pull request #19 from altentee/hooroo-master

Hooroo master