Now uses initjs generator
Merge branch 'master' into rails4