fixing key problem for rails keys
Merge branch 'master' into 0.1.1