Feature/rails3 update dependencies