Feature/rails3 update dependencies

Updated several dependencies - I recommend to let travis test things before we merge :)