Merge in Yeoman-generated AngularJS App