Squashed commit of the following (Merge upstream):

commit 0b06305c6180af623a37242d4663aa1c3e78121f
Author: Chad Engler <cengler@blizzard.com>
Date:   Thu Dec 19 11:36:31 2013 -0800

    change travis script

commit 7f30ea53a20c241092a7f79d901df7ad66931fb0
Author: Chad Engler <cengler@blizzard.com>
Date:   Thu Dec 19 11:34:07 2013 -0800

    update travis file to be more explicit

commit ce8add7c6286824d08a7b405b57121a40ea93f0b
Merge: 50d3dd7 812fb07
Author: Chad Engler <cengler@blizzard.com>
Date:   Thu Dec 19 11:30:30 2013 -0800

    merge in jshint fixes

commit 50d3dd7f2ce1379f1c0f047a0ccc5eb126682216
Merge: ffc68fc 3385362
Author: Chad Engler <cengler@blizzard.com>
Date:   Thu Dec 19 11:04:32 2013 -0800

    merge texture scaling, fixes #201 and #378

commit ffc68fc5b6a01f23c775cec5b815a0c8c58529fc
Merge: 786d286 576ff71
Author: Chad Engler <chad@pantherdev.com>
Date:   Wed Dec 18 15:21:11 2013 -0800

    Merge pull request #452 from lachenmayer/ellipse

    Fix el(l)ipse spelling error

commit 786d2868b7f65b2fc7a4df59ebdd670cc22ae627
Author: Chad Engler <cengler@blizzard.com>
Date:   Wed Dec 18 15:14:29 2013 -0800

    Add contributing information

commit 576ff716832a58d9281f020e340a2bbcb30b407a
Author: Harry Lachenmayer <harrylachenmayer@gmail.com>
Date:   Thu Dec 19 00:05:32 2013 +0100

    Fix el(l)ipse spelling error

commit c9f79ea4d9f3317f5c909caece74d548f81a7073
Merge: dd0974c b41af9f
Author: Mat Groves <matgroves23@gmail.com>
Date:   Mon Dec 16 13:32:59 2013 -0800

    Merge pull request #444 from MKelm/dev-atlas

    Atlas spritesheet file loader

commit dd0974c9413d5162148e5ee31b2f85430b94ba9a
Author: Florian Landerl <florian@landerl.at>
Date:   Fri Dec 13 22:26:26 2013 +0100

    Check for webserved files by looking at the protocol

    Previously it would assume a file is being served from the web as long as href happened to include the string 'http' anywhere - not just at the beginning.

commit b41af9f14d6c721f0df1e0d0bbcfa80f6136cdee
Author: Martin Kelm <martinkelm@shrt.ws>
Date:   Sat Dec 14 12:15:18 2013 +0100

    revert Spine.js

commit dc49c7b3968da57eabaf80325752d87b2d18e102
Merge: e38d189 5794c68
Author: Martin Kelm <martinkelm@shrt.ws>
Date:   Sat Dec 14 12:09:25 2013 +0100

    merge upstream/dev

commit 5794c688cef1fc3ef36f952c0d222c80fc016721
Merge: 9a05606 da868e7
Author: Chad Engler <chad@pantherdev.com>
Date:   Fri Dec 13 07:40:10 2013 -0800

    Merge pull request #442 from photonstorm/dev

    Fixed IE11 check. IE11 no longer has MSIE in the userAgent, you need to ...

commit da868e7f41ea7a55840f6040c5607e876215d49a
Author: photonstorm <rich@photonstorm.com>
Date:   Fri Dec 13 13:51:55 2013 +0000

    Fixed IE11 check. IE11 no longer has MSIE in the userAgent, you need to check for Trident/7.0 instead.

commit 812fb076deced61016a0ac47af283de871996915
Author: Chad Engler <englercj@live.com>
Date:   Sun Dec 8 17:37:09 2013 -0800

    remove build badge until pixi is on travis-ci

commit 13cf18ce39c612cb5f6de0d7fc0f05728dac1056
Author: Chad Engler <englercj@live.com>
Date:   Sun Dec 8 17:33:42 2013 -0800

    some small changes to tests

commit 2f5d3a450abae0e5cf46207177b9358a06c3d49e
Author: Chad Engler <englercj@live.com>
Date:   Sun Dec 8 17:11:40 2013 -0800

    no longer need that

commit 6dafb2524d4656f38493fd706638fadef8d3b9db
Author: Chad Engler <englercj@live.com>
Date:   Sun Dec 8 17:00:30 2013 -0800

    moar jshint fixes for tests

commit 5d516cfb8177e5d70be0da745e47ec5df1d5c873
Author: Chad Engler <englercj@live.com>
Date:   Sun Dec 8 16:14:18 2013 -0800

    remove some trailing whitespace

commit 648a9bd33e1edd179cfe6a799f5f6fd3acbf1b40
Author: Chad Engler <englercj@live.com>
Date:   Sun Dec 8 15:42:56 2013 -0800

    a million and one jshint fixes

commit 5e08abcc312170188a7e4bfb62137073022c62d0
Author: Chad Engler <englercj@live.com>
Date:   Sun Dec 8 09:39:05 2013 -0800

    remove some comments

commit 12943e6390bbd10263ff885ceac800bfbfb9bbc8
Author: Chad Engler <englercj@live.com>
Date:   Sun Dec 8 09:11:11 2013 -0800

    update some modules

commit a423216a8c9d6cbd95e63209d836fa7284a58688
Author: Chad Engler <englercj@live.com>
Date:   Sun Dec 8 09:11:05 2013 -0800

    change the way jshint runs a bit

commit eb1d191a06bb6c71e3a2397f62e70ab1142207ad
Author: Chad Engler <englercj@live.com>
Date:   Sun Dec 8 08:52:14 2013 -0800

    more up-to-date jshintrc

commit a60de480ff340c8319721c0dab884eadd8ac20f8
Merge: d979e16 da4c67d
Author: Chad Engler <englercj@live.com>
Date:   Sun Dec 8 08:44:50 2013 -0800

    Merge #302 from @drkibitz, and fix conflicts

commit d979e1611d66a9e5813b2e7093102bc646ed8b57
Merge: 9a05606 67d0c57
Author: Chad Engler <englercj@live.com>
Date:   Sun Dec 8 08:31:14 2013 -0800

    Merge #304 from @drkibitz, and fix conflicts

commit 9a0560608be55530bae4e862a5d4704fc7b27baa
Author: Chad Engler <englercj@live.com>
Date:   Sun Dec 8 08:11:06 2013 -0800

    Merge and close #347, use inherit for cursor style instead of default

commit 8cb5e1351f459913792c054bbf2fc3ccc887feaa
Merge: d854f5c be6e77b
Author: Chad Engler <englercj@live.com>
Date:   Sun Dec 8 08:01:01 2013 -0800

    fix conflicts

commit d854f5c699ab919eed69d3920b3edd870884f14e
Merge: 5d45bbf 68b53b5
Author: Chad Engler <chad@pantherdev.com>
Date:   Sun Dec 8 07:58:38 2013 -0800

    Merge pull request #415 from mattdesl/basetex-destroy2

    Cleaning up BaseTexture Destroy

commit 5d45bbfc4b566da30aa55236eb66ee5cf84b6138
Author: josh shepard <josh.shepard@gmail.com>
Date:   Sun Dec 1 19:41:49 2013 -0800

    fix incorrect width property for multi-line BitmapText

    BitmapText.updateText() was setting this.width to the width of the last line of multi-line text, rather than that of the longest line. this made it impossible to center multi-line strings. (found working in Phaser)

commit b6f51b34b09ac8612b27b69cb8f43d41d86f30fd
Author: alexpusch <alexpoo@gmail.com>
Date:   Sat Dec 7 14:55:08 2013 +0200

    Fix setText documentation attribute

commit 05ca70e12880831a5b50e2ff5d737592815e1ab4
Merge: 86e51af 6a7a33c
Author: Chad Engler <chad@pantherdev.com>
Date:   Fri Dec 6 11:00:18 2013 -0800

    Merge pull request #431 from namuol/swapChildren

    `swapChildren` implementation

commit 6a7a33c898347e57110017427e94054c5af88f5d
Author: Louis Acresti <louis.acresti@gmail.com>
Date:   Fri Dec 6 00:55:01 2013 -0500

    style consistency

commit 2c97041de87a65e61ddb8581479050e0d7cce936
Author: Louis Acresti <louis.acresti@gmail.com>
Date:   Fri Dec 6 00:49:06 2013 -0500

    check for invalid children

commit 99bf7d62f16eea1c5dc9cba928aa59a6b72aa223
Author: Louis Acresti <louis.acresti@gmail.com>
Date:   Fri Dec 6 00:45:37 2013 -0500

    early-out for self-swap

commit 6a405543098e7dbc6f8fa265a191ecd876e9464f
Author: Louis Acresti <louis.acresti@gmail.com>
Date:   Thu Dec 5 21:05:57 2013 -0500

    removed example from main swap branch

commit 8c5f4a6d77c5bfbf1059eff560f3ed5a911ecece
Author: Louis Acresti <louis.acresti@gmail.com>
Date:   Thu Dec 5 20:54:47 2013 -0500

    simple swapChildren example/test

commit 59fc91dbe732514ce3a794ceb5c53e62bf2f1e92
Author: Louis Acresti <louis.acresti@gmail.com>
Date:   Thu Dec 5 20:45:21 2013 -0500

    swapChildren basic implementation

commit 86e51af5c0c4f89dd66e7600e33e52513521bdd4
Author: Mat Groves <mat@goodboydigital.com>
Date:   Tue Dec 3 12:05:22 2013 +0000

    Fixed issue with removing children with filters

commit 5785e64b0cc117a254ad06803543889814893d54
Author: Mat Groves <mat@goodboydigital.com>
Date:   Tue Dec 3 11:15:35 2013 +0000

    Merged new PIXI Shader code

commit 400a7d8827eb7cc2a974b25238c1139823529721
Merge: b5a2216 a4ea181
Author: Mat Groves <mat@goodboydigital.com>
Date:   Tue Dec 3 10:56:37 2013 +0000

    Merge branch 'pr/406' into dev

    Conflicts:
    	bin/pixi.dev.js
    	bin/pixi.js
    	src/pixi/renderers/webgl/PixiShader.js

commit b5a221678802d7af020c458416d27cab32db8bbe
Author: Mat Groves <mat@goodboydigital.com>
Date:   Tue Dec 3 10:48:01 2013 +0000

    Tweaking filters

    Doc update

commit a4ea181f2307976abba6e5c501fd1881a797b0dd
Author: photonstorm <rich@photonstorm.com>
Date:   Tue Nov 26 14:31:21 2013 +0000

    Dramatically refactored PixiShader. Significantly smaller, less branching, much faster sync loop and no constant texture uploads.

commit 68b53b5c0fc636002a7d0d66c144a72fd9bc8184
Author: mattdesl <dave.des@gmail.com>
Date:   Mon Nov 25 13:14:56 2013 -0500

    cleaning up base texture destroy & adding removeAllEventListeners to EventTarget

commit be6e77b1e3712a0400bc610b99019ba1f336ae3a
Author: mattdesl <dave.des@gmail.com>
Date:   Mon Nov 25 14:10:13 2013 -0500

    adding base64 support to AssetLoader

commit 2f594e4d2ff658957913bf5615c02656cfc44a39
Author: photonstorm <rich@photonstorm.com>
Date:   Thu Nov 21 04:28:21 2013 +0000

    Made sampler2D check more robust.

commit 3c4be97fe21c1218a47465fff5c02e05b09656a2
Author: photonstorm <rich@photonstorm.com>
Date:   Wed Nov 20 18:38:01 2013 +0000

    Fixed typo in AbstractFilter (unifroms to uniforms)

commit 49fff52fc85a7a01480486dfbfbfcb8cb73da108
Author: photonstorm <rich@photonstorm.com>
Date:   Wed Nov 20 16:19:25 2013 +0000

    Updated PixiShader to use standard uniform naming conventions (1f, 2f, 2fv, etc). Added support for multiple sampler2D calls, allowing multi-texture shaders. Added support for Linear, Repeat, Nearest, Audio and Keyboard textures. Updated all the examples to use the new uniform naming convention. Updated Gruntfile to use the renamed GrayFilter and fixed indexAll in Example 15 to use the GrayFilter as well.

commit d7ce7616089a759d0f318a79a8c791520975fc1b
Author: Chad Engler <englercj@live.com>
Date:   Sun Nov 10 09:13:59 2013 -0800

    Manually merge #400

commit d930d17390c27c9251c50ac7f9f81eae9d117a80
Merge: 414d5c5 ce43cfd
Author: Mat Groves <matgroves23@gmail.com>
Date:   Wed Nov 6 13:27:16 2013 -0800

    Merge pull request #396 from GoodBoyDigital/gray

    Change grey to gray, silly English...

commit ce43cfdb5c6b91f9d091ef45b0fef22bc6800a3f
Author: Chad Engler <cengler@blizzard.com>
Date:   Wed Nov 6 09:41:29 2013 -0800

    Change grey to gray, silly English...

commit 414d5c5be4150988dfd416c56c602ab368ade01d
Author: Chad Engler <englercj@live.com>
Date:   Wed Nov 6 06:29:11 2013 -0800

    ignore sublime text files

commit 000df6b33b96d519465b4f4f65108d693fb6508f
Author: Chad Engler <englercj@live.com>
Date:   Wed Nov 6 06:28:03 2013 -0800

    remove sublime-* files

commit 4204ada63e6848d92f6569e3e0a78d9cfef44ca0
Author: Mat Groves <mat@goodboydigital.com>
Date:   Tue Nov 5 19:51:39 2013 +0000

    Added 2 filters fix filter bug

    Fixed filter bug where filters not wotkring on transparent renderer
    Added CrossHatchFilter
    Added RGBSplitFilter
    Updated Example 15

commit fdf7dcaf6139a5e894c6ea7e5d09a3648379d0ce
Merge: 0796f9d 2bc359e
Author: Mat Groves <matgroves23@gmail.com>
Date:   Tue Nov 5 05:00:46 2013 -0800

    Merge pull request #391 from noffle/dev

    Adds word wrapping to Pixi.TEXT.

commit 2bc359e7d5fd6c8ac31013a6f75b808c4c938cf0
Author: Stephen Whitmore <stephen.whitmore@gmail.com>
Date:   Mon Nov 4 16:00:26 2013 -0500

    Fixes #386; adds word wrapping to Pixi.TEXT.

    This wraps lines of text using a simple greedy algorithm that optimizes
    for fewest lines given an arbitrary horizontal bound.

commit 0796f9d53de62aa1b1cb17f325d2492b45bfa6bf
Author: Mat Groves <matgroves23@gmail.com>
Date:   Mon Nov 4 16:49:12 2013 +0000

    Update README.md

commit b39061d9d8133db442491a5199d24121379f1171
Author: Mat Groves <mat@goodboydigital.com>
Date:   Sun Nov 3 19:26:40 2013 +0000

    Fixed Issue #313

commit c165b2ebbdff8201b6625e95dd201b5592ba703e
Author: Mat Groves <mat@goodboydigital.com>
Date:   Sun Nov 3 17:50:39 2013 +0000

    Moved program uniforms

    Moved program uniforms locations to the PixiShader rather than the
    glProgram

commit f8094acb2b4b7aeb0f7ad96dacde9c462a6439a0
Author: Mat Groves <mat@goodboydigital.com>
Date:   Sun Nov 3 17:19:35 2013 +0000

    Graphics Bug fixs

    Fixed bug where webGL graphics not working in safari
    Fixed bug where Collinear points cause lines to be draw oddly

commit acc4092e21a7f3803f38f37516e53cd34c50e618
Author: Mat Groves <mat@goodboydigital.com>
Date:   Sun Nov 3 12:43:17 2013 +0000

    Removed rogue console.log

commit 087aab16be38c36d7e35c868b26de5ddd57ca4b0
Author: Mat Groves <mat@goodboydigital.com>
Date:   Sun Nov 3 12:38:31 2013 +0000

    Line width now more accurate

commit 85f1bd6557af4a0fea33f4db70a571936c0b1101
Author: Mat Groves <mat@goodboydigital.com>
Date:   Sun Nov 3 10:46:41 2013 +0000

    WebGL masking issue fixed

    WebGL mask objects can now be nested within masked objects

commit 932ca800329278988e18e26043b5b4305931a544
Author: Mat Groves <mat@goodboydigital.com>
Date:   Sat Nov 2 15:51:02 2013 +0000

    All Filter Exampls Added

    Example 16 removed as no longer required
    added Color step filter
    added Twist filter
    added Dot screen

commit 6c762fb3964f55fdf25ae35393fbae1ccd20d223
Author: Mat Groves <mat@goodboydigital.com>
Date:   Sat Nov 2 11:37:42 2013 +0000

    Docs updated

commit a46b74f8cac31f4aed88f9b1d20b3b7ade2ec36e
Author: Mat Groves <mat@goodboydigital.com>
Date:   Fri Nov 1 13:51:25 2013 +0000

    Filter Tweaks

    Displacement Map Filter tweaked
    Demos created

commit 429851493c3c126801f827db2e6a8dabc4497e08
Author: Mat Groves <mat@goodboydigital.com>
Date:   Wed Oct 30 23:40:40 2013 +0000

    Tweaks to Filters runing in render Texture

    Added Blur Example

commit 10379289bb56a227dd548fb5b87d504e30d4545a
Author: Mat Groves <mat@goodboydigital.com>
Date:   Wed Oct 30 09:02:34 2013 +0000

    Example updated and redundant files deleted

commit 74b94a0e27d35de8270a2642ae1a161cb10dd886
Author: Mat Groves <mat@goodboydigital.com>
Date:   Wed Oct 30 01:33:14 2013 +0000

    Filters updates

    Added new filters
    Added ability for filters to have multiple passes
    Optimized texture creation for filters

commit 2829575604d7940d4d12bef40d4d20b3233aa091
Merge: 46ae15a a199377
Author: Mat Groves <mat@goodboydigital.com>
Date:   Tue Oct 29 16:59:05 2013 +0000

    Merge branch 'dev' of https://github.com/GoodBoyDigital/pixi.js into dev

commit 46ae15a6ce6d5eb0de25c82ffcd056f38c85266b
Author: Mat Groves <mat@goodboydigital.com>
Date:   Tue Oct 29 16:57:39 2013 +0000

    New Filter Structure

    Base Filters now working for graphics and sprite
    Filters now nestable

commit 33853620669bb391a05e0cadfb502255bacfeba1
Author: Chad Engler <englercj@live.com>
Date:   Sat Oct 26 16:47:02 2013 -0700

    Enable per-texture scale filtering

commit a19937702ef7bb101d7b3c68dec1bafca4b18790
Merge: e50a671 ddb24d7
Author: Chad Engler <chad@pantherdev.com>
Date:   Thu Oct 24 10:36:46 2013 -0700

    Merge pull request #374 from mattdesl/concat-sourcemaps

    Changes to Development Workflow

commit ddb24d7fe0339df305f816832454cb1183538282
Author: mattdesl <dave.des@gmail.com>
Date:   Wed Oct 23 11:44:34 2013 -0400

    - using a single JS source for all examples instead of duplicating files unnecessarily.
    - updating Gruntfile and package.json to include grunt-concat-sourcemap and grunt-contrib-watch for easier development.
    - use "grunt build-debug" to build a source-mapped file to pixi.dev.js -- or use "grunt watch" during development of examples to auto build-debug any JS changes to PIXI source or the example files.

commit e50a6716d8bd1c78fd4d383a22451210c04fbac3
Author: Mat Groves <mat@goodboydigital.com>
Date:   Sun Oct 20 18:30:47 2013 +0100

    fixed bug in masking example

commit c512bd35a451da2bb024db425bc1ad337d0ac77f
Author: Mat Groves <mat@goodboydigital.com>
Date:   Sun Oct 20 18:26:25 2013 +0100

    Displacment Map Added

commit 127aff7594766b751054c41f12e9d8149666e810
Author: Mat Groves <mat@goodboydigital.com>
Date:   Sat Oct 19 17:43:06 2013 +0100

    Canvas + removed

commit 5199e6e946a672419c2055698e40699bdb64c213
Author: Mat Groves <mat@goodboydigital.com>
Date:   Sat Oct 19 17:23:47 2013 +0100

    Canvas Tweaks

commit 44cef3f077ee2b7d33ec9305f87fb0915581cf06
Merge: a73763e fc80c0c
Author: Chad Engler <englercj@live.com>
Date:   Sat Oct 19 09:00:13 2013 -0700

    merge dev-webgl-filters into dev

commit a73763ee194c845d40a82112e6d764854356d492
Author: Mat Groves <mat@goodboydigital.com>
Date:   Thu Oct 17 16:26:02 2013 +0100

    ie11 patch

    Tempory patch to force canvas in ie11 until i get webGL working in there

commit 91562cea08bc175bf3597f97db078961854c9913
Author: Chad Engler <englercj@live.com>
Date:   Tue Oct 15 21:02:36 2013 -0700

    attempt to get a 'webgl' context when 'experimental-webgl' fails

commit 58360c877cae4bbb9bf8aaad217b29f43a30f190
Merge: 56df185 67be6cb
Author: Chad Engler <chad@pantherdev.com>
Date:   Tue Oct 15 15:31:32 2013 -0700

    Merge pull request #358 from mattdesl/detector-fix

    Updating Detector.js to use latest check

commit 67be6cb55d7b2d5bcaaaa57a32c0a49df83473bc
Merge: 8c2da28 8541dd8
Author: mattdesl <dave.des@gmail.com>
Date:   Tue Oct 15 17:15:32 2013 -0400

    Merge branch 'detector-fix' of https://github.com/mattdesl/pixi.js into detector-fix

commit 8c2da284a914d54d6bf681c068169348b5a8b26c
Author: mattdesl <dave.des@gmail.com>
Date:   Tue Oct 15 16:47:56 2013 -0400

    update Detector.js; now supports SlimerJS and other environments

commit 8541dd87a948dfd7152f78df6eaee9832afd6595
Author: mattdesl <dave.des@gmail.com>
Date:   Tue Oct 15 16:47:56 2013 -0400

    updating Detector to use new ThreeJS method which supports more environments (like SublimeJS)

commit 67d0c577d3163e527043f6973a4b3a31131cab08
Author: Dr. Kibitz <info@drkibitz.com>
Date:   Tue Sep 24 09:32:56 2013 -0700

    Squashed commit of the following (jshint):

    commit 09d68fb83686b82a2cbac0d99abcc7e0899d6724
    Author: Dr. Kibitz <info@drkibitz.com>
    Date:   Tue Sep 10 13:14:22 2013 -0700

        ignore W069 just in 4 methods

    commit 931afab48f374194a808bedac4e31dd9c20d2ae4
    Author: Dr. Kibitz <info@drkibitz.com>
    Date:   Tue Sep 10 13:14:03 2013 -0700

        fix for warning W055

    commit 43ad62a89a1c83e8da85dd9f9bb6e8a7c0acd59d
    Author: Dr. Kibitz <info@drkibitz.com>
    Date:   Tue Sep 10 13:13:46 2013 -0700

        rename HEXtoRGB to hex2rgb

    commit adc2a1e83823061709dbf1d4b037bebeddc7281c
    Author: Dr. Kibitz <info@drkibitz.com>
    Date:   Tue Sep 10 13:13:02 2013 -0700

        Changed some jshint settings

    commit 0d8eb1ef71332b076a0f9bd565633c92395ed5ec
    Author: Dr. Kibitz <info@drkibitz.com>
    Date:   Sun Sep 1 16:16:53 2013 -0700

        unittest-refactor branch compatible jshint setup

    commit 3e91e79dab7c34dbb60bf364124d2ef7df93ec6d
    Author: Dr. Kibitz <info@drkibitz.com>
    Date:   Sun Sep 1 11:15:34 2013 -0700

        Final progress, jshint passed

    commit c0f3750a06616195cf76149091dce4a1da7717ab
    Author: Dr. Kibitz <info@drkibitz.com>
    Date:   Sun Sep 1 10:31:36 2013 -0700

        More progress

    commit b2118949bb47cbeffaf53d2cb1a978c8f9ffdf49
    Author: Dr. Kibitz <info@drkibitz.com>
    Date:   Sun Sep 1 02:38:10 2013 -0700

        jshint progress

commit da4c67d38b6a7ff4d177e973670e2a72763200fb
Author: Dr. Kibitz <info@drkibitz.com>
Date:   Tue Sep 24 09:37:17 2013 -0700

    Squashed commit of the following (unittest-refactor):

    commit 9887e45976fc5211a4393e588d278a5e10baf06c
    Author: Dr. Kibitz <info@drkibitz.com>
    Date:   Tue Sep 3 10:54:13 2013 -0700

        FIX: Ellipse getBounds method is not static

    commit b3b359ad1c0fae412209705b01081dd231383656
    Author: Dr. Kibitz <info@drkibitz.com>
    Date:   Tue Sep 3 10:53:41 2013 -0700

        More unit testing

    commit dafbd1dbb03364b6d54db0cad26c4f02a8b9efe1
    Author: Dr. Kibitz <info@drkibitz.com>
    Date:   Sun Sep 1 16:04:29 2013 -0700

        Remove unused karma plugin

    commit 43209bfb59263278d2dc3561d06926ad515c4147
    Author: Dr. Kibitz <info@drkibitz.com>
    Date:   Sun Sep 1 15:28:21 2013 -0700

        Add Travis CI status image to README

    commit 2e38ba370bc05c239736155dcb06e34b47abf938
    Author: Dr. Kibitz <info@drkibitz.com>
    Date:   Sun Sep 1 15:16:54 2013 -0700

        typo

    commit b8898030da4d3e7b446ebb4ddeb30e8fc0adcf39
    Author: Dr. Kibitz <info@drkibitz.com>
    Date:   Sun Sep 1 15:13:33 2013 -0700

        Lint test files, jsthint:test is now part of the test task

    commit ea414dd1d734b39523174bd86d0cc58e920a89d2
    Author: Dr. Kibitz <info@drkibitz.com>
    Date:   Sun Sep 1 15:11:50 2013 -0700

        Make all boilerplate tests, and an actual start to writing some real tests

    commit 9e09c87997ae924989da4e1685f3a94636ab64de
    Author: Dr. Kibitz <info@drkibitz.com>
    Date:   Sun Sep 1 14:37:51 2013 -0700

        Add back serving png files, convert to spaces

    commit b45b1650c2e812a9cdb1165d96fba7b14bbdfab7
    Author: Dr. Kibitz <info@drkibitz.com>
    Date:   Sun Sep 1 00:55:57 2013 -0700

        Comment out functional tests for now

    commit 3a350bf9e4d9fea470ad8e734dfc3542db74ccc8
    Author: Dr. Kibitz <info@drkibitz.com>
    Date:   Sat Aug 31 23:53:35 2013 -0700

        Removed quint, added karma, added resemble.js, refactored unit tests for mocha, added first example visual test

        run with:
        grunt travis

        You should see a brewer open and eventually see the spinning bunny. Then in the terminal, you should see the tests running where it matches frames 30, 60, and 90.

        Conflicts:
        	package.json

    commit ac4c6de388e7a37786c9c4a6b2c95e22ec26b05d
    Author: Dr. Kibitz <info@drkibitz.com>
    Date:   Sat Aug 31 23:33:23 2013 -0700

        Remove trailing whitespace

commit fc80c0c602a1a5757a173592ee2d8ef0f4682e9f
Author: Mat Groves <mat@goodboydigital.com>
Date:   Mon Sep 30 01:19:21 2013 +0100

    FIlters Added.. again!

    some filters added to pixi
    example 15 added too

commit e38d1892b60a0d2e753b6f9c4be030b322f1d59d
Author: Martin Kelm <martinkelm@shrt.ws>
Date:   Wed Aug 7 20:02:33 2013 +0200

    atlas loader support more than one spritesheet file

commit 58e4a6abc5fa2b11cc88de4dbf0495eec310a8a6
Merge: d8c922a 3d935a8
Author: Martin Kelm <martinkelm@shrt.ws>
Date:   Sun Aug 4 21:14:06 2013 +0200

    Merge remote-tracking branch 'upstream/dev' into dev

commit d8c922ac4b8b7ec1d079ca4db599f5b09e241546
Author: Martin Kelm <martinkelm@shrt.ws>
Date:   Wed Jul 31 22:23:08 2013 +0200

    fix doc header

commit ffd641018f919e95d0eab7639e94f1aa1a958284
Author: Martin Kelm <martinkelm@shrt.ws>
Date:   Wed Jul 31 09:19:32 2013 +0200

    fixed realSize property names

commit 3528f2a1c8b014ae53df7735dc9deb0f40911c95
Author: Martin Kelm <martinkelm@shrt.ws>
Date:   Wed Jul 31 09:12:26 2013 +0200

    added atlas loader in gruntfile

commit 6fd961692288e51e490d0804253af9b4db928402
Author: Martin Kelm <martinkelm@shrt.ws>
Date:   Wed Jul 31 09:07:13 2013 +0200

    added approach for trim in atlas loader

commit 573cc9fcfac44bfdb071c8dba5f0c920f609b692
Author: Martin Kelm <martinkelm@shrt.ws>
Date:   Tue Jul 30 22:39:07 2013 +0200

    removed trailing comma

commit b1f4ef2d82e0059c52e41ae6a2fb25688cd5e809
Author: Martin Kelm <martinkelm@shrt.ws>
Date:   Tue Jul 30 22:38:32 2013 +0200

    added spine atlas file loader
Clean up after merge
Version v0.2.0