Fix tavis yaml, manually merge #486

change travis script

update travis file to be more explicit

Squashed commit of the following (unittest-refactor): ...

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

    FIX: Ellipse getBounds method is not static

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

    More unit testing

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

    Remove unused karma plugin

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

    Add Travis CI status image to README

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

    typo

commit b889803
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 ea414dd
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 9e09c87
Author: Dr. Kibitz <info@drkibitz.com>
Date:   Sun Sep 1 14:37:51 2013 -0700

    Add back serving png files, convert to spaces

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

    Comment out functional tests for now

commit 3a350bf
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 ac4c6de
Author: Dr. Kibitz <info@drkibitz.com>
Date:   Sat Aug 31 23:33:23 2013 -0700

    Remove trailing whitespace