minor rake updates
merger updates