converted to ruby 1.9 hash syntax everywhere wooooo