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