Changing lib require
Using Configuration shorthand
Merge branch 'master' of github.com:vitork/vitork

Conflicts:
	init.rb