Modified merge functions to not set created_at columns on update

Both the created_at and created_on columns are stripped out for updates.

Also added 'rake' as a development dependency since it's needed to run specs.