Add Fedora as a separate os
Update the tests to ensure Fedora 14 support
fix lint errors in setup
Bump up version and update dependency on specinfra not to use 2.0.0.beta
Adds spaces for readability
Merge pull request #401 from JHaals/master

fix lint errors in setup
Add redhat7 as an OS family.
Merge pull request #372 from CtrlZvi:add_fedora_support

Add Fedora as a separate os

Conflicts:
	Rakefile
	lib/serverspec/helper/os.rb
Merge pull request #402 from mhaskel:redhat7-service-enabled

Add redhat7 as an OS family

Conflicts:
	Rakefile
Bump up version
adding support for the windows scheduled task
Merge pull request #403 from liamjbennett/windows_scheduledtask

adding support for the windows scheduled task
Bump up version
Merge branch 'master' into 2.0

Conflicts:
	README.md
	lib/serverspec/version.rb
	serverspec.gemspec
Remove OS specific specs