Directly require 'spec_helper'
Merge pull request #249 from duggiefresh/spec-directory

Directly require 'spec_helper'; clean up code.