refactor billing query a bit
update to ruby 2.1.4