Merge remote-tracking branch 'upstream/master' into switch-fork

Author: colinrotherham

.npmignore

@@ -0,0 +1,19 @@
+*.swp
+.DS_Store
+.grunt
+_SpecRunner.html
+test/coverage
+dist_temp
+node_modules
+npm-debug.log
+bower_components
+test
+*.iml
+.idea
+.jshintrc
+.npmignore
+.travis.yml
+composer.json
+contributing.md
+Gruntfile.js
+karma.conf.js

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
-env: 
-  matrix: 
+env:
+  matrix:
   - TEST_SUITE=unit
   - TEST_SUITE=integration BROWSER='firefox'
   - TEST_SUITE=integration BROWSER='firefox:3.5'
@@ -13,16 +13,21 @@ env:
   - TEST_SUITE=integration BROWSER='internet explorer:10'
   - TEST_SUITE=integration BROWSER='internet explorer:11'
   - TEST_SUITE=integration BROWSER='chrome'
-  global: 
+  global:
   - secure: VY4J2ERfrMEin++f4+UDDtTMWLuE3jaYAVchRxfO2c6PQUYgR+SW4SMekz855U/BuptMtiVMR2UUoNGMgOSKIFkIXpPfHhx47G5a541v0WNjXfQ2qzivXAWaXNK3l3C58z4dKxgPWsFY9JtMVCddJd2vQieAILto8D8G09p7bpo=
   - secure: kehbNCoYUG2gLnhmCH/oKhlJG6LoxgcOPMCtY7KOI4ropG8qlypb+O2b/19+BWeO3aIuMB0JajNh3p2NL0UKgLmUK7EYBA9fQz+vesFReRk0V/KqMTSxHJuseM4aLOWA2Wr9US843VGltfODVvDN5sNrfY7RcoRx2cTK/k1CXa8=
-node_js: 
-- 0.11.13
-before_script: 
+node_js:
+- "4.1"
+cache:
+  directories:
+    - node_modules
+    - bower_components
+before_install:
 - npm install -g grunt-cli@0.1.13
-- npm install -g node-static@0.7.3
 - npm install -g bower@1.3.8
-- bower install
+install:
+- npm install
+before_script:
 - grunt build
 script: test/ci
 addons:

CHANGELOG.md

@@ -136,7 +136,6 @@ module.exports = function(grunt) {
       bloodhound: {
         src: '<%= tempDir %>/bloodhound.js',
         objectToExport: 'Bloodhound',
-        amdModuleId: 'bloodhound',
         deps: {
           default: ['$'],
           amd: ['jquery'],
@@ -146,7 +145,6 @@ module.exports = function(grunt) {
       },
       typeahead: {
         src: '<%= tempDir %>/typeahead.jquery.js',
-        amdModuleId: 'typeahead.js',
         deps: {
           default: ['$'],
           amd: ['jquery'],