Modularization of Matterhorn and Tomcat modules
New classes, new submodule organization
Prepare for heirafication.
matterhorn submodule
Merge branch 'upstream_integration'

Conflicts:
	.gitmodules
	manifests/avalon/framework.pp
Merge branch 'master' of github.com:mbklein/avalon-vagrant
Merge pull request #7 from evilensky/master

Matterhorn, tomcat