Add OSX java
Add synergy
Less code
Try and fix the node['lsb'] missing attribute on osx
More rvm fixes
Merge remote-tracking branch 'chef-applications/master' into fix/recipes_debian

* chef-applications/master:
  More rvm fixes
  Try and fix the node['lsb'] missing attribute on osx
  Less code
  Add synergy
  Add OSX java

Conflicts:
	recipes/rvm.rb