Add unite-rails
Merge branch 'master' into mac