rvm_version, tomcat dependency for java7
Merge branch 'master' of https://github.com/virtualop/service_descriptors