regex the current version of tomcat 8.0.x

Conflicts:
	spec/acceptance/acceptance_1_spec.rb
regex current version of Tomcat 6.0.x and 7.0.x
Merge pull request #38 from mhaskel/cherrypick_test_fixes

Cherrypick test fixes