Merge pull request #46 from mixonic/rails4

Rails 4
include in finder query columns from 'with_same' option
use arel to construct sql updates