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
Typo :(
Merge pull request #38 from mhaskel/cherrypick_test_fixes

Cherrypick test fixes
Merge pull request #39 from mhaskel/typo

Typo :(
1.0.1 prep
Merge pull request #41 from mhaskel/cherrypick-changelog

1.0.1 prep
Merge remote-tracking branch 'upstream/1.0.x' into test
Merge pull request #42 from mhaskel/test

Test