Basic Rails 4.0

Change-Id: I57edeb48798d43c6ed30074dc8b59a8e5430ecd8
Fix some deprecation warnings.

Change-Id: I3f4ee5f91abc645e4fccfb9544bfb5f885d9ca70
Fix rolify deprecation warnings.

Change-Id: I615cece34c6b9734506d36b5a827ba8734dc6b7a
Removed hash diff.

Change-Id: I7da3688ef454ede93349501d83b55882af094f6f