Feature/rails3 update dependencies

WIP

please, do not merge yet