Rails 4 compatibility

Remove return from before_validation proc to fix exception under Rails 4 head. Remove Rails 4.0.0.rc1 deprecation warnings.

Now with clean Git history!