Added require_relative. And includes for running out of rake.
Merge remote-tracking branch 'origin/master'