commit cleanup.
Merge branch 'setenv-fix' of github.com:zshahan/puppetlabs-tomcat into setenv_fix

Conflicts:
	manifests/setenv/entry.pp
	spec/defines/setenv/entry_spec.rb
Merge pull request #35 from mhaskel/setenv_fix

Setenv fix