Test Env works, but test are still red
Merge branch 'master' into spec-cleanup

Conflicts:
	cybercoach.gemspec
	spec/lib/cyber_coach_spec.rb
	spec/spec_helper.rb
clean spec helper