Merge pull request #7 from evilensky/master

Matterhorn, tomcat
Merge pull request #10 from evilensky/master

Trying to organize dependent RPMs into classes. maybe failing.
Merge pull request #11 from evilensky/master

Commits $solr_home/collection1/conf and other goodies and updates submodules
a few changes to fix rvm
comitting mediainfo
mediainfo
Merge branch 'master' of github.com:mbklein/avalon-vagrant

Conflicts:
	manifests/avalon/framework.pp
additional cleanup
Merge branch 'master' of github.com:mbklein/avalon-vagrant

Conflicts:
	manifests/avalon/framework.pp
remove mediainfo, accidentally commited it outside of modules/
Merge branch 'reorg' of github.com:evilensky/avalon-vagrant
Committing needed JARs for Solr 4.2.0 for Avalon.
Merge branch 'master' of github.com:mbklein/avalon-vagrant into rebasing

Conflicts:
	modules/fcrepo
	modules/matterhorn
	modules/solr