Add helper method `os` to get OS info easily
Merge pull request #111 from serverspec/os-helper-method

Add helper method `os` to get OS info easily
check_os() returns CPU architecture
Merge pull request #114 from serverspec/os-arch

check_os() returns CPU architecture
Update subproject
Bump up version
Merge branch 'master' into 2.0

Conflicts:
	lib/specinfra/helper/detect_os.rb
	lib/specinfra/version.rb