Merge pull request #1 from ryanatty/develop

Testing the webhook.
Merge pull request #2 from ryanatty/develop

Second test of webhooks
Merge pull request #3 from ryanatty/develop

Test Travis CI
Merge pull request #4 from ryanatty/develop

Added codesship image
Merge pull request #5 from ryanatty/develop

Test of Travis CI build
Merge pull request #6 from ryanatty/develop

Update travis config
Merge pull request #7 from ryanatty/develop

travis config update
Merge pull request #8 from ryanatty/develop

update travis config, add npm install
Revert "update travis config, add npm install"
Merge pull request #9 from kodawork/revert-8-develop

Revert "update travis config, add npm install"
Merge pull request #10 from ryanatty/develop

travis config updates
Resolve .travis.yml conflict