added support for guard and spork
fixed problem with ids being saved on update