up rails to 4
add some notes
fix user controller test