Move to ruby 2.0 and a couple of minor tweaks