Fixing for RxJS 4.0

Author: mattpodwysocki

.travis.yml

@@ -1,3 +1,14 @@
 language: node_js
 node_js:
   - "0.10"
+  - "0.12"
+  - 4
+  - iojs
+notifications:
+  slack: reactivex:e424dAgQ2W9kuRMe6ngxHQbv
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/8f1482d7420d95b647ce
+    on_success: change  # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always
+    on_start: false     # default: false

Gruntfile.js

@@ -5,7 +5,7 @@ module.exports = function (grunt) {
     meta: {
       banner:
         '/*'+
-        'Copyright (c) Microsoft Open Technologies, Inc.  All rights reserved.\r\n' +
+        'Copyright (c) Microsoft.  All rights reserved.\r\n' +
         'Microsoft Open Technologies would like to thank its contributors, a list.\r\n' +
         'of whom are at http://aspnetwebstack.codeplex.com/wikipage?title=Contributors..\r\n' +
         'Licensed under the Apache License, Version 2.0 (the "License"); you.\r\n' +
@@ -20,42 +20,38 @@ module.exports = function (grunt) {
         '*/'
     },
     ngAnnotate: {
-        options: {
-            add: true,
-            singleQuotes: true
-        },
-        'rx.angular': {
-            files: [
-                {
-                    expand: true,
-                    src: 'dist/rx.angular.js'
-                }
-            ]
-        }
+    options: {
+      add: true,
+      singleQuotes: true
+    },
+    'rx.angular': {
+      files: [{
+        expand: true,
+        src: 'dist/rx.angular.js'
+        }]
+      }
     },
     concat: {
       basic: {
         src: [
-          'src/license.js',
-          'src/intro.js',
-          'src/basicheader.js',
+          'src/headers/license.js',
+          'src/headers/intro.js',
+          'src/internal/trycatch.js',
           'src/module.js',
           'src/factory.js',
           'src/observeonscope.js',
           'src/safeApply.js',
           'src/$rootScopeExtensions.js',
           'src/observableRuntimeExtensions.js',
-          'src/scopescheduler.js',
-          'src/manageScope.js',
-          'src/outro.js'
+          'src/headers/outro.js'
         ],
         dest: 'dist/rx.angular.js'
       }
     },
     uglify: {
       options: {
         banner:
-          '/* Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.*/'
+          '/* Copyright (c) Microsoft. All rights reserved. See License.txt in the project root for license information.*/'
       },
       basic: {
         options: {