ember-app-kit updates.  Squashed commit of the following:

commit 7f40b0dd6b90949d1d635bf86a62a6c79594223c
Merge: 3ceba55 8285d5c
Author: Stefan Penner <stefan.penner@gmail.com>
Date:   Wed Jan 8 10:48:49 2014 -0800

    Merge pull request #407 from astonishdesign/feature/fix_testemjs

    Removes static reference to testem.js; Moves testem.js to public

commit 8285d5ce1e430e51393e6465bfcbfece5ab4bffe
Author: FilmKnurd <andrew@astonishdesign.com>
Date:   Wed Jan 8 12:02:41 2014 -0600

    Removes space between lines

commit 411eed34609c89951079fd047a12e5fba5375c7d
Author: FilmKnurd <andrew@astonishdesign.com>
Date:   Tue Jan 7 14:36:37 2014 -0600

    Removes static reference to testem.js; Moves testem.js to public

commit 3ceba556f7eace742978ee7e83e91a6374475861
Merge: 39d172d e8d7158
Author: Stefan Penner <stefan.penner@gmail.com>
Date:   Tue Jan 7 22:51:06 2014 -0800

    Merge pull request #406 from pangratz/soothe_jshint

    Soothe JSHint which cries about "Mixed spaces and tabs."

commit e8d71582af1c624140cb70138c1c36e30309332a
Author: pangratz <cmueller.418@gmail.com>
Date:   Wed Jan 8 07:32:46 2014 +0100

    Soothe JSHint which cries about "Mixed spaces and tabs."

    ```
    $ grunt jshint
    Running "jshint:app" (jshint) task
    >> 9 files lint free.

    Running "jshint:tooling" (jshint) task
    >> 29 files lint free.

    Running "jshint:tests" (jshint) task
    Linting tests/testem.js ...ERROR
    [L9:C3] W099: Mixed spaces and tabs.
     *     <script src="/testem.js"></script>

    Done, without errors.
    ```

commit 39d172d637becbe8f1f6fc757ce574ce9ea526c1
Merge: ea03583 e9961a9
Author: Stefan Penner <stefan.penner@gmail.com>
Date:   Tue Jan 7 17:53:13 2014 -0800

    Merge pull request #383 from opsb/fix_dist_config

    Only copy production environment config when using grunt dist

commit ea03583836d379f2d8610445dcacf77e9781153f
Merge: 53e434f 1495a99
Author: Stefan Penner <stefan.penner@gmail.com>
Date:   Tue Jan 7 17:52:42 2014 -0800

    Merge pull request #403 from stefanpenner/default-templates

    Error and loading default templates

commit 53e434f0d6619f544bc92de4e85de398d4fc3c36
Merge: c717779 9441914
Author: Stefan Penner <stefan.penner@gmail.com>
Date:   Tue Jan 7 11:16:58 2014 -0800

    Merge pull request #404 from astonishdesign/feature/fix_testemjs

    Fixes URL routing

commit 94419146c5e5bdeaf7aae6d74d7a81b162035a58
Author: FilmKnurd <andrew@astonishdesign.com>
Date:   Tue Jan 7 12:44:21 2014 -0600

    Fixes URL routing

    The way the static middleware works, to serve a file but also let
    index.html catch everything, the urlRoot option must be used in
    conjunction with the directory option.

    Previously, the introduction of faking the testem.js file broke
    location history routing, because all routes were caught by the
    testem fake file. This patch serves the fake file for the URL, but
    also preserves the index.html catch all.

commit 1495a99015f792bce5b3ba9523a2b5dd549eaabf
Author: Stefan Penner <stefan.penner@gmail.com>
Date:   Mon Jan 6 16:24:14 2014 -0500

    Error and loading default templates

commit c717779859ea3e52a8449d2d8b43fba3582e0f17
Author: Stefan Penner <stefan.penner@gmail.com>
Date:   Mon Jan 6 15:46:54 2014 -0500

    a sane default RSVP onerror now exists in ember

commit 559a1456fac955f8379e82e596563554cd1501d2
Author: Stefan Penner <stefan.penner@gmail.com>
Date:   Mon Jan 6 15:34:22 2014 -0500

    upgrade to latest es6-module-transpiler

commit 85bf4ff8424331a47900bc1166d4dc76faafc7ad
Merge: ed1814b b89a3ae
Author: Stefan Penner <stefan.penner@gmail.com>
Date:   Mon Jan 6 11:58:36 2014 -0800

    Merge pull request #402 from astonishdesign/feature/fix_inbrowser_tests

    [#401] Fakes testem.js so that in-browser tests run

commit b89a3aeb2bd9b849cd9aba07088ae27a75037b7c
Author: FilmKnurd <andrew@astonishdesign.com>
Date:   Mon Jan 6 13:54:19 2014 -0600

    [#401] Fakes testem.js so that in-browser tests run

    Testem requires a script tag to load /testem.js, which is supplied
    by Testem. This file doesn't actually exist on the file system, which
    causes localhost:8000/tests to fail with a global failure.

    By telling express to serve up a fake testem.js file, the script load
    is satisfied, thus making it posible to execute the tests in both
    the Testem and direct contexts.

commit ed1814b96dff11a031610b6efe09fde54ff3f874
Merge: c6ffdf4 01195b0
Author: Stefan Penner <stefan.penner@gmail.com>
Date:   Sun Jan 5 18:53:56 2014 -0800

    Merge pull request #400 from astonishdesign/feature/simplified_testem

    Simplifies testem configuration to reduce duplication

commit 01195b04c230dcf3d6457ac8d4cda3ee4fed94ea
Author: FilmKnurd <andrew@astonishdesign.com>
Date:   Sun Jan 5 20:30:18 2014 -0600

    Simplifies testem configuration to reduce duplication

    Instead of specifying the source and serve files, this change
    utilizes the test_page option to test index.html directly and load
    all the scripts as specified in that file.

      - Removes src and serve options from grunt testem task and from
        testem.json
      - Adds testem.js to index.html as per
        [testem docs](https://github.com/airportyh/testem#include-snippet)
      - Adds routes to testem configuration so that testem can correctly
        locate test files and assets as referenced in index.html

commit c6ffdf4d6d0ed325ec15a091b9c559d831f9cb83
Merge: 2365f2b c5827a7
Author: Stefan Penner <stefan.penner@gmail.com>
Date:   Sun Jan 5 10:52:04 2014 -0800

    Merge pull request #399 from astonishdesign/feature/testem_test_index

    Configures Testem to use the test build of index.html

commit c5827a72f3ece3f4dff514823a4521f05b1d694c
Author: FilmKnurd <andrew@astonishdesign.com>
Date:   Sun Jan 5 11:08:25 2014 -0600

    Configures Testem to use the test build of index.html

    The old Karma configuration ran tests against the test build of
    index.html (/result/test/index.html). This updates the configuration
    to keep with that setting.

commit 2365f2b8b0aa970c0b4c310e1efa9a7d72a86281
Merge: 00abb1e 66ea764
Author: Stefan Penner <stefan.penner@gmail.com>
Date:   Fri Jan 3 14:57:51 2014 -0800

    Merge pull request #395 from MajorBreakfast/master

    Added autoprefixer, connect-livereload now enabled by default

commit 00abb1e558e6f6e31c3316698c3a3f27c9984ea4
Merge: 5835f89 b96bdf6
Author: Stefan Penner <stefan.penner@gmail.com>
Date:   Fri Jan 3 09:44:05 2014 -0800

    Merge pull request #397 from cavneb/issue/392

    removed test:server grunt task and added testem config json

commit b96bdf622dd862ae182fc772687affe0b3b0b281
Author: Eric Berry <cavneb@gmail.com>
Date:   Fri Jan 3 09:33:02 2014 -0700

    removed test:server grunt task and added testem config json

commit 66ea76406ebfe25a99a3812b4db91701a66ecea4
Author: Josef Brandl <mail@josefbrandl.de>
Date:   Wed Jan 1 11:16:48 2014 +0100

    Added autoprefixer, connect-livereload now enabled by default

commit 5835f8907085951a695a90f4babe663daac43811
Merge: ed9c8f4 0387609
Author: Stefan Penner <stefan.penner@gmail.com>
Date:   Sun Dec 29 07:24:40 2013 -0800

    Merge pull request #390 from rivol/master

    Use absolute paths for dist assets

commit 0387609d2610c5d6f981bac0f3d8081242e2618f
Author: Rivo Laks <rivolaks@gmail.com>
Date:   Sun Dec 29 16:58:36 2013 +0200

    Use absolute paths for dist assets

commit ed9c8f470a08efe71fa2f21cd6afffd0f1a5b739
Merge: d8073e4 8ee4ce3
Author: Stefan Penner <stefan.penner@gmail.com>
Date:   Sun Dec 29 06:30:42 2013 -0800

    Merge pull request #389 from raytiley/port

    Validate port of development server

commit 8ee4ce38a8b8160b703792c2b7e7524298c4ac0e
Author: Ray Tiley <raytiley@gmail.com>
Date:   Sat Dec 28 23:12:36 2013 -0600

    Validate port of development server

commit d8073e456b5d35107f3b91fb51ae149d613002d5
Author: Stefan Penner <stefan.penner@gmail.com>
Date:   Sun Dec 29 02:02:02 2013 -0500

    save resolution

commit b05999fbb6323a2a43c458a9d9c59748d4bf8bc0
Author: Stefan Penner <stefan.penner@gmail.com>
Date:   Sun Dec 29 00:26:58 2013 -0500

    toddy-up start app helper

commit df399d9b166a029a2d0647947e65a27d92b9a41b
Author: Stefan Penner <stefan.penner@gmail.com>
Date:   Sun Dec 29 00:26:41 2013 -0500

    upgrade ember

commit b1d902ab578f9f805278c36af7208fcb520d00bf
Merge: 0f2d2b8 9105058
Author: Stefan Penner <stefan.penner@gmail.com>
Date:   Sat Dec 28 20:52:31 2013 -0800

    Merge pull request #292 from cavneb/feature/testem

    replaced karma with testem

commit 0f2d2b840eeb5b0998f687cf0894d434110d86c5
Merge: b14ce82 632626d
Author: Stefan Penner <stefan.penner@gmail.com>
Date:   Sat Dec 28 20:51:25 2013 -0800

    Merge pull request #385 from MajorBreakfast/master

    Fancy Sprites (Video :)

commit 632626df456c6734f8b01e09157e327041448765
Author: Josef Brandl <mail@josefbrandl.de>
Date:   Mon Dec 23 15:36:05 2013 +0100

    Fix

commit 351546ee1998bc7c9f54e5ac9b640e210e49e34a
Author: Josef Brandl <mail@josefbrandl.de>
Date:   Mon Dec 23 15:15:57 2013 +0100

    Fancy Sprites

commit b14ce8286e135411ea55148c27264d4ecce3e2c7
Merge: 88af455 d9f8f58
Author: Stefan Penner <stefan.penner@gmail.com>
Date:   Thu Dec 19 07:34:13 2013 -0800

    Merge pull request #384 from cavneb/feature/loom-integrate

    Integrated loom generators

commit d9f8f581c91c91fd1124c5b8608c894f484b0c95
Author: Eric Berry <cavneb@gmail.com>
Date:   Thu Dec 19 08:29:42 2013 -0700

    Integrated loom generators

commit 9105058ce71c7f78db767cddab529d2edcd550f9
Merge: 967dd45 88af455
Author: Eric Berry <cavneb@gmail.com>
Date:   Thu Dec 19 08:24:03 2013 -0700

    Merge remote-tracking branch 'upstream/master' into feature/testem

commit e9961a96119014aba2d98d30b803a16a81310176
Author: opsb <oliver@opsb.co.uk>
Date:   Wed Dec 18 13:50:12 2013 -0700

    Only copy production environment config when using grunt dist

commit 88af455472287830640fdeb378021d091ec0315b
Merge: 5c3e2e6 9d9f1d2
Author: Stefan Penner <stefan.penner@gmail.com>
Date:   Wed Dec 18 09:21:46 2013 -0800

    Merge pull request #382 from fsmanuel/master

    adds ember-testing-httpRespond to bower.json #369

commit 9d9f1d20d5870731f47d2f8397272b25dd7fa5da
Author: Manuel Wiedenmann <manuel@funkensturm.de>
Date:   Wed Dec 18 18:14:09 2013 +0100

    adds ember-testing-httpRespond to bower.json #369

commit 5c3e2e6ee2711169b109659c871dc3be2d98cb79
Merge: 73eadcd 58c08d0
Author: Stefan Penner <stefan.penner@gmail.com>
Date:   Tue Dec 17 13:17:48 2013 -0800

    Merge pull request #381 from cavneb/feature/update-loom-npm

    Updated grunt file to reference using appkit compatible loom

commit 58c08d04f9904c84b748abf8f47620e3360a5eca
Author: Eric Berry <cavneb@gmail.com>
Date:   Tue Dec 17 14:09:31 2013 -0700

    Updated grunt file to reference using appkit compatible loom

commit 73eadcd62d206ffe8db0e40621b06a9d4ea7fece
Merge: 808f695 6f2fa4c
Author: Stefan Penner <stefan.penner@gmail.com>
Date:   Mon Dec 16 18:49:20 2013 -0800

    Merge pull request #380 from jas/express-deprecation-warning

    Suppress Express deprecation warning caused by `bodyParser` middleware

commit 6f2fa4cd72762bd6c5128d9f5f3c4db5665c4090
Author: Jason Sandmeyer <jasandmeyer@me.com>
Date:   Mon Dec 16 21:19:46 2013 -0500

    Suppress Express deprecation warning

commit 808f6957d0bd99aa7c708ec0a26aaf46a594b14d
Author: machty <machty@gmail.com>
Date:   Thu Dec 12 11:40:38 2013 -0500

    Bump ic-ajax

    Bump to the version of ic-ajax that distinguishes
    between ic.ajax and ic.ajax.raw

commit 1747de969ed25b577f2c779cb8dacead9392a682
Merge: 041a2d3 f55c74e
Author: Stefan Penner <stefan.penner@gmail.com>
Date:   Thu Dec 12 06:11:28 2013 -0800

    Merge pull request #372 from bcardarella/bc-cleaner-default-env-files

    Don't destroy global config object

commit f55c74ef269284cb06d6652ef09d654233d7fa31
Author: Brian Cardarella <bcardarella@gmail.com>
Date:   Thu Dec 12 01:31:11 2013 -0500

    Don't destroy global config object

    This will encourage people not to destory their window.ENV object by
    reassigning it a completely new value.

    The environemnt specific files should load after `environemnt.js` has
    loaded. This way the values assigned to `window.ENV` in those
    environment specific files can overwrite any defaults set in
    `environment.js`

    I have also cleaned up the comments somewhat and included a simple
    example of setting a config value.

commit 041a2d367734d3288a7b3d5b45798b0df93843af
Merge: 87c5964 eafa9ff
Author: Stefan Penner <stefan.penner@gmail.com>
Date:   Wed Dec 11 20:32:28 2013 -0800

    Merge pull request #370 from rjackson/add_config

    Add default config setup.

commit eafa9ffaa8eafe7f1e0010ecb5b31cb5e51332eb
Author: Robert Jackson <robert.w.jackson@me.com>
Date:   Wed Dec 11 14:09:48 2013 -0500

    Add default config setup.

    Allows specifying configuration in the following files:

    * `config/environment.js` - This is loaded in all enviroments.
    * `config/environments/production.js` - This is loaded when
      building with `grunt dist`.
    * `config/environments/development.js` - This is loaded when
      building a normal development server (via `grunt server` generally).
    * `config/environments/test.js` - This is loaded when running tests via
      either browsing to `/tests` URL or running via karma.

commit 87c5964ec1a909b0a6071e80d053d92615b4cc94
Author: Alex Matchneer <machty@gmail.com>
Date:   Wed Dec 11 13:49:54 2013 -0500

    isolatedContainer should know what not to instantiate

    No reason to make people write this boilerplate themselves, right?

commit de1cb2844388c329f9f5a62fac7cd493290683b1
Merge: eaac8df 4df9a98
Author: Thomas Boyt <me@thomasboyt.com>
Date:   Tue Dec 10 11:52:14 2013 -0800

    Merge pull request #366 from ghempton/emberscript

    add .em files to watch:scripts

commit 4df9a98079a08e55ba7085a79ff1998cfb7f16fc
Author: Gordon L. Hempton <ghempton@gmail.com>
Date:   Tue Dec 10 11:50:50 2013 -0800

    add .em files to watch:scripts

commit eaac8dfeba030130a62f341b53d5ddd35c0f82b5
Merge: b5e5a5f 4c227bf
Author: Thomas Boyt <me@thomasboyt.com>
Date:   Thu Dec 5 21:14:30 2013 -0800

    Merge pull request #362 from ghempton/emberscript

    support for emberscript

commit 4c227bf5e9291baa183c9bf0757c9b58de755be2
Author: Gordon L. Hempton <ghempton@gmail.com>
Date:   Thu Dec 5 20:35:22 2013 -0800

    support for emberscript

commit 967dd454d022a82328a63c97489732330e0cf690
Merge: 9a3b569 27b5699
Author: Eric Berry <cavneb@gmail.com>
Date:   Mon Dec 2 09:06:24 2013 -0700

    Merge remote-tracking branch 'upstream/master' into feature/testem

    Conflicts:
    	Gruntfile.js
    	app/app.js
    	karma.conf.js
    	package.json

commit 9a3b56997e7b763de4e9a8b220ef0f21c943204a
Merge: c8c6b9b 94db20a
Author: Eric Berry <cavneb@gmail.com>
Date:   Fri Nov 8 08:46:40 2013 -0800

    Merge pull request #1 from stefanpenner/fix-pr-292

    Fix pr 292

commit 94db20ad0789f89a04248e91b471c36d3f2bc748
Author: Stefan Penner <stefan.penner@gmail.com>
Date:   Wed Nov 6 23:18:20 2013 -0500

    fix testum to rebuild correctly

commit dcc6ae248520d1a903c43e2c3eb0c2fc1c196c11
Merge: c8c6b9b b708335
Author: Stefan Penner <stefan.penner@gmail.com>
Date:   Wed Nov 6 22:59:43 2013 -0500

    Merge branch 'master' into pr/292

commit c8c6b9b37953be8e9dbc02af7659c60d8ec1b519
Author: Eric Berry <cavneb@gmail.com>
Date:   Wed Nov 6 11:08:54 2013 -0700

    replaced karma with testem