update gemspec to support rails4.1 beta2
fix conflict