User Kaleidoscope as merge tool
rails4 plugin is depricated