Merge pull request #117 from mcanevet/instance_base

Set instance_basedir's default to $tomcat::instance_basedir
Refactor tomcat::instance